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

Remove unecessary calls to query_is_parsed/parse_query.

Browse Source 
query_classifier_get_operation() parsed the query if it has not
yet been parsed. In the other places, the query need not be
parsed.
This commit is contained in:
Johan Wikman
2016-01-08 10:59:21 +02:00
parent 97282fca97
commit 57b79fc663
1 changed files with 0 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
server/modules/filter/dbfwfilter.c
View File

@ -1610,13 +1610,8 @@ bool rule_matches(FW_INSTANCE* my_instance,
if (is_sql) if (is_sql)
{ {
if (!query_is_parsed(queue))
{
parse_query(queue);
}
optype = query_classifier_get_operation(queue); optype = query_classifier_get_operation(queue);
is_real = skygw_is_real_query(queue); is_real = skygw_is_real_query(queue);
} }
if (rulelist->rule->on_queries == QUERY_OP_UNDEFINED || rulelist->rule->on_queries & optype) if (rulelist->rule->on_queries == QUERY_OP_UNDEFINED || rulelist->rule->on_queries & optype)
@ -1867,11 +1862,6 @@ bool check_match_any(FW_INSTANCE* my_instance, FW_SESSION* my_session, GWBUF *qu
if (is_sql) if (is_sql)
{ {
if (!query_is_parsed(queue))
{
parse_query(queue);
}
qlen = gw_mysql_get_byte3(memptr); qlen = gw_mysql_get_byte3(memptr);
qlen = qlen < 0xffffff ? qlen : 0xffffff; qlen = qlen < 0xffffff ? qlen : 0xffffff;
fullquery = malloc((qlen) * sizeof(char)); fullquery = malloc((qlen) * sizeof(char));
@ -1932,11 +1922,6 @@ bool check_match_all(FW_INSTANCE* my_instance,
if (is_sql) if (is_sql)
{ {
if (!query_is_parsed(queue))
{
parse_query(queue);
}
qlen = gw_mysql_get_byte3(memptr); qlen = gw_mysql_get_byte3(memptr);
qlen = qlen < 0xffffff ? qlen : 0xffffff; qlen = qlen < 0xffffff ? qlen : 0xffffff;
fullquery = malloc((qlen) * sizeof(char)); fullquery = malloc((qlen) * sizeof(char));