hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MXS-2013 Remove all CHK_-macros

Browse Source
This commit is contained in:
Johan Wikman
2018-08-14 15:32:37 +03:00
parent 8fd1648217
commit ae43e4f0f2
19 changed files with 1 additions and 287 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
server/modules/routing/binlogrouter/blr.cc
View File

@ -1185,8 +1185,6 @@ newSession(MXS_ROUTER *instance, MXS_SESSION *session)
inst->slaves = slave;
spinlock_release(&inst->lock);
CHK_CLIENT_RSES(slave);
return reinterpret_cast<MXS_ROUTER_SESSION*>(slave);
}
@ -1293,7 +1291,6 @@ closeSession(MXS_ROUTER *instance, MXS_ROUTER_SESSION *router_session)
blr_master_reconnect(router);
return;
}
CHK_CLIENT_RSES(slave);
/**
* Lock router client session for secure read and update.
@ -2416,8 +2413,6 @@ static bool rses_begin_locked_router_action(ROUTER_SLAVE *rses)
{
bool succp = false;
CHK_CLIENT_RSES(rses);
spinlock_acquire(&rses->rses_lock);
succp = true;
@ -2440,7 +2435,6 @@ static bool rses_begin_locked_router_action(ROUTER_SLAVE *rses)
*/
static void rses_end_locked_router_action(ROUTER_SLAVE *rses)
{
CHK_CLIENT_RSES(rses);
spinlock_release(&rses->rses_lock);
}

1
server/modules/routing/maxinfo/maxinfo.cc
View File

@ -281,7 +281,6 @@ static void handleError(MXS_ROUTER *instance,
if (session->state == SESSION_STATE_ROUTER_READY)
{
CHK_DCB(client_dcb);
client_dcb->func.write(client_dcb, gwbuf_clone(errbuf));
}

3
server/modules/routing/readconnroute/readconnroute.cc
View File

@ -495,7 +495,6 @@ closeSession(MXS_ROUTER *instance, MXS_ROUTER_SESSION *router_session)
*/
if (backend_dcb != NULL)
{
CHK_DCB(backend_dcb);
dcb_close(backend_dcb);
}
}
@ -763,8 +762,6 @@ static void handleError(MXS_ROUTER *instance, MXS_ROUTER_SESSION *router_session
if (sesstate == SESSION_STATE_ROUTER_READY)
{
CHK_DCB(client_dcb);
client_dcb->func.write(client_dcb, gwbuf_clone(errbuf));
}

4
server/modules/routing/readwritesplit/rwsplitsession.cc
View File

@ -270,7 +270,6 @@ GWBUF* RWSplitSession::discard_master_wait_gtid_result(GWBUF *buffer)
SRWBackend& RWSplitSession::get_backend_from_dcb(DCB *dcb)
{
ss_dassert(dcb->dcb_role == DCB_ROLE_BACKEND_HANDLER);
CHK_DCB(dcb);
for (auto it = m_backends.begin(); it != m_backends.end(); it++)
{
@ -736,7 +735,6 @@ void RWSplitSession::handleError(GWBUF *errmsgbuf, DCB *problem_dcb,
mxs_error_action_t action, bool *succp)
{
ss_dassert(problem_dcb->dcb_role == DCB_ROLE_BACKEND_HANDLER);
CHK_DCB(problem_dcb);
MXS_SESSION *session = problem_dcb->session;
ss_dassert(session);
@ -881,7 +879,6 @@ bool RWSplitSession::handle_error_new_connection(DCB *backend_dcb, GWBUF *errmsg
SRWBackend& backend = get_backend_from_dcb(backend_dcb);
MXS_SESSION* ses = backend_dcb->session;
bool route_stored = false;
CHK_SESSION(ses);
if (backend->is_waiting_result())
{
@ -968,7 +965,6 @@ void RWSplitSession::handle_error_reply_client(DCB *backend_dcb, GWBUF *errmsg)
if (sesstate == SESSION_STATE_ROUTER_READY)
{
CHK_DCB(m_client);
m_client->func.write(m_client, gwbuf_clone(errmsg));
}
}

5
server/modules/routing/schemarouter/schemaroutersession.cc
View File

@ -614,7 +614,6 @@ void SchemaRouterSession::handleError(GWBUF* pMessage,
bool* pSuccess)
{
ss_dassert(pProblem->dcb_role == DCB_ROLE_BACKEND_HANDLER);
CHK_DCB(pProblem);
SSRBackend bref = get_bref_from_dcb(pProblem);
if (bref.get() == NULL) // Should never happen
@ -824,8 +823,6 @@ bool SchemaRouterSession::have_servers()
*/
SSRBackend SchemaRouterSession::get_bref_from_dcb(DCB* dcb)
{
CHK_DCB(dcb);
for (SSRBackendList::iterator it = m_backends.begin(); it != m_backends.end(); it++)
{
if ((*it)->dcb() == dcb)
@ -1804,4 +1801,4 @@ SERVER* SchemaRouterSession::get_ps_target(GWBUF* buffer, uint32_t qtype, qc_que
return rval;
}
}
}