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

Partially revert 4ba011266843857bbd3201e5b925a47e88e1808f

Browse Source 
Add back leading operator enforcement.
This commit is contained in:
Markus Mäkelä
2018-09-20 15:26:51 +03:00
parent d8d0b1a29c
commit 71ffef5708
95 changed files with 1395 additions and 1392 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
server/modules/routing/schemarouter/schemarouterinstance.cc
View File

@ -208,9 +208,9 @@ SchemaRouterSession* SchemaRouter::newSession(MXS_SESSION* pSession)
void SchemaRouter::diagnostics(DCB* dcb)
{
double sescmd_pct = m_stats.n_sescmd != 0
? 100.0 * ((double)m_stats.n_sescmd / (double)m_stats.n_queries)
: 0.0;
double sescmd_pct = m_stats.n_sescmd != 0 ?
100.0 * ((double)m_stats.n_sescmd / (double)m_stats.n_queries) :
0.0;
/** Session command statistics */
dcb_printf(dcb, "\n\33[1;4mSession Commands\33[0m\n");
@ -243,9 +243,9 @@ void SchemaRouter::diagnostics(DCB* dcb)
json_t* SchemaRouter::diagnostics_json() const
{
double sescmd_pct = m_stats.n_sescmd != 0
? 100.0 * ((double)m_stats.n_sescmd / (double)m_stats.n_queries)
: 0.0;
double sescmd_pct = m_stats.n_sescmd != 0 ?
100.0 * ((double)m_stats.n_sescmd / (double)m_stats.n_queries) :
0.0;
json_t* rval = json_object();
json_object_set_new(rval, "queries", json_integer(m_stats.n_queries));

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

@ -126,9 +126,9 @@ void SchemaRouterSession::close()
m_router->m_stats.ses_shortest = ses_time;
}
m_router->m_stats.ses_average
= (ses_time + ((m_router->m_stats.sessions - 1) * m_router->m_stats.ses_average))
/ (m_router->m_stats.sessions);
m_router->m_stats.ses_average =
(ses_time + ((m_router->m_stats.sessions - 1) * m_router->m_stats.ses_average))
/ (m_router->m_stats.sessions);
spinlock_release(&m_router->m_lock);
}
@ -558,8 +558,8 @@ void SchemaRouterSession::clientReply(GWBUF* pPacket, DCB* pDcb)
bref->backend()->server->name,
m_client->session,
m_state & INIT_MAPPING ? "true" : "false",
m_queue.size() == 0 ? "none"
: m_queue.size() > 0 ? "multiple" : "one");
m_queue.size() == 0 ? "none" :
m_queue.size() > 0 ? "multiple" : "one");
if (m_state & INIT_MAPPING)
{
@ -1807,8 +1807,8 @@ SERVER* SchemaRouterSession::get_ps_target(GWBUF* buffer, uint32_t qtype, qc_que
rval = m_shard.get_location(tables[0]);
MXS_FREE(tables[i]);
}
rval ? MXS_INFO("Prepare statement on server %s", rval->name)
: MXS_INFO("Prepared statement targets no mapped tables");
rval ? MXS_INFO("Prepare statement on server %s", rval->name) :
MXS_INFO("Prepared statement targets no mapped tables");
MXS_FREE(tables);
}
else if (mxs_mysql_is_ps_command(command))