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

MXS-2020 Replace ss_debug with MXB_AT_DEBUG

Browse Source
This commit is contained in:
Johan Wikman
2018-08-22 09:41:27 +03:00
parent 84876b881b
commit b1e405442f
20 changed files with 38 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/modules/routing/avrorouter/avro_converter.cc
View File

@ -386,7 +386,7 @@ void AvroConverter::column(int i)
void AvroConverter::set_active(int i)
{
ss_debug(int rc =)avro_value_get_by_name(&m_record, m_create->columns[i].name.c_str(),
MXB_AT_DEBUG(int rc =)avro_value_get_by_name(&m_record, m_create->columns[i].name.c_str(),
&m_field, NULL);
ss_dassert(rc == 0);
}

2
server/modules/routing/avrorouter/avro_file.cc
View File

@ -151,7 +151,7 @@ static int conv_state_handler(void* data, const char* section, const char* key,
if (strcmp(key, "gtid") == 0)
{
gtid_pos_t gtid;
ss_debug(bool rval = )gtid.parse(value);
MXB_AT_DEBUG(bool rval = )gtid.parse(value);
ss_dassert(rval);
router->handler.set_gtid(gtid);
}

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

@ -1206,7 +1206,7 @@ static void freeSession(MXS_ROUTER* router_instance,
ROUTER_INSTANCE *router = (ROUTER_INSTANCE *)router_instance;
ROUTER_SLAVE *slave = (ROUTER_SLAVE *)router_client_ses;
ss_debug(int prev_val = ) atomic_add(&router->stats.n_slaves, -1);
MXB_AT_DEBUG(int prev_val = ) atomic_add(&router->stats.n_slaves, -1);
ss_dassert(prev_val > 0);
/*

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

@ -458,7 +458,7 @@ static void freeSession(MXS_ROUTER* router_instance, MXS_ROUTER_SESSION* router_
ROUTER_INSTANCE* router = (ROUTER_INSTANCE *) router_instance;
ROUTER_CLIENT_SES* router_cli_ses = (ROUTER_CLIENT_SES *) router_client_ses;
ss_debug(int prev_val = ) atomic_add(&router_cli_ses->backend->connections, -1);
MXB_AT_DEBUG(int prev_val = ) atomic_add(&router_cli_ses->backend->connections, -1);
ss_dassert(prev_val > 0);
MXS_FREE(router_cli_ses);

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

@ -82,7 +82,7 @@ static SRWBackend compare_backends(SRWBackend a, SRWBackend b, select_criteria_t
void RWSplitSession::handle_connection_keepalive(SRWBackend& target)
{
ss_dassert(target);
ss_debug(int nserv = 0);
MXB_AT_DEBUG(int nserv = 0);
/** Each heartbeat is 1/10th of a second */
int keepalive = m_config.connection_keepalive * 10;
@ -92,7 +92,7 @@ void RWSplitSession::handle_connection_keepalive(SRWBackend& target)
if (backend->in_use() && backend != target && !backend->is_waiting_result())
{
ss_debug(nserv++);
MXB_AT_DEBUG(nserv++);
int diff = mxs_clock() - backend->dcb()->last_read;
if (diff > keepalive)

2
server/modules/routing/readwritesplit/rwsplit_session_cmd.cc
View File

@ -87,7 +87,7 @@ void RWSplitSession::process_sescmd_response(SRWBackend& backend, GWBUF** ppPack
if (command == MXS_COM_STMT_PREPARE && cmd != MYSQL_REPLY_ERR)
{
// This should never fail or the backend protocol is broken
ss_debug(bool b = )mxs_mysql_extract_ps_response(*ppPacket, &resp);
MXB_AT_DEBUG(bool b = )mxs_mysql_extract_ps_response(*ppPacket, &resp);
ss_dassert(b);
backend->add_ps_handle(id, resp.id);
}