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

Use query type instead of operation for ccrfilter

Browse Source 
The query operation not being a select is too strict and not very
precise. Only queries that actually modify data should trigger the adding
of routing hints.
This commit is contained in:
Markus Mäkelä
2017-01-20 17:24:24 +02:00
parent 8cffa4ad58
commit 4e6fde8a23
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
server/modules/filter/ccrfilter/ccrfilter.c
View File

@ -307,7 +307,7 @@ routeQuery(MXS_FILTER *instance, MXS_FILTER_SESSION *session, GWBUF *queue)
* Not a simple SELECT statement, possibly modifies data. If we're processing a statement * Not a simple SELECT statement, possibly modifies data. If we're processing a statement
* with unknown query type, the safest thing to do is to treat it as a data modifying statement. * with unknown query type, the safest thing to do is to treat it as a data modifying statement.
*/ */
if ((qc_get_operation(queue) & ~QUERY_OP_SELECT) != 0) if (qc_query_is_type(qc_get_type_mask(queue), QUERY_TYPE_WRITE))
{ {
if ((sql = modutil_get_SQL(queue)) != NULL) if ((sql = modutil_get_SQL(queue)) != NULL)
{ {
@ -316,9 +316,19 @@ routeQuery(MXS_FILTER *instance, MXS_FILTER_SESSION *session, GWBUF *queue)
{ {
if (my_instance->match == NULL || if (my_instance->match == NULL ||
(my_instance->match && regexec(&my_instance->re, sql, 0, NULL, 0) == 0)) (my_instance->match && regexec(&my_instance->re, sql, 0, NULL, 0) == 0))
{
if (my_instance->count)
{ {
my_session->hints_left = my_instance->count; my_session->hints_left = my_instance->count;
MXS_INFO("Write operation detected, next %d queries routed to master", my_instance->count);
}
if (my_instance->time)
{
my_session->last_modification = now; my_session->last_modification = now;
MXS_INFO("Write operation detected, queries routed to master for %d seconds", my_instance->time);
}
my_instance->stats.n_modified++; my_instance->stats.n_modified++;
} }
} }