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

query_classifier.cc:skygw_get_canonical: Fixed bug in how strings were passed to replace_literal function. Changed to use item->str_ptr which stores all strings in the same way unlike item->name in which some string values have double quotation.

Browse Source 
skygw_utils.cc:Fixed regexp so that it detects literals at the end of line too.
This commit is contained in:
VilhoRaatikka
2014-09-01 13:23:04 +03:00
parent 40f85f9cad
commit 20abbbdf57
2 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
query_classifier/query_classifier.cc
View File

@ -892,7 +892,8 @@ char* skygw_get_canonical(
} }
pi = (parsing_info_t *)gwbuf_get_buffer_object_data(querybuf, pi = (parsing_info_t *)gwbuf_get_buffer_object_data(querybuf,
GWBUF_PARSING_INFO); GWBUF_PARSING_INFO);
CHK_PARSING_INFO(pi);
if (pi == NULL) if (pi == NULL)
{ {
querystr = NULL; querystr = NULL;
@ -911,10 +912,9 @@ char* skygw_get_canonical(
querystr = NULL; querystr = NULL;
goto retblock; goto retblock;
} }
querystr = strdup(pi->pi_query_plain_str); querystr = strdup(pi->pi_query_plain_str);
for (item=thd->free_list; item != NULL; item=item->next) for (item=thd->free_list; item != NULL; item=item->next)
{ {
Item::Type itype; Item::Type itype;
@ -928,10 +928,20 @@ char* skygw_get_canonical(
itype == Item::VARBIN_ITEM || itype == Item::VARBIN_ITEM ||
itype == Item::NULL_ITEM)) itype == Item::NULL_ITEM))
{ {
if (itype == Item::STRING_ITEM && strlen(item->name) == 0) if (itype == Item::STRING_ITEM)
{ {
querystr = replace_literal(querystr, "\"\"", "\"?\""); String tokenstr;
} String* res = item->val_str_ascii(&tokenstr);
if (res->is_empty()) /*< empty string */
{
querystr = replace_literal(querystr, "\"\"", "\"?\"");
}
else
{
querystr = replace_literal(querystr, res->ptr(), "?");
}
}
else else
{ {
querystr = replace_literal(querystr, item->name, "?"); querystr = replace_literal(querystr, item->name, "?");

2
utils/skygw_utils.cc
View File

@ -1883,7 +1883,7 @@ char* replace_literal(
const char* replacement) const char* replacement)
{ {
const char* prefix = "[ ='\",\\(]"; /*< ' ','=','(',''',''"',',' are allowed before needle */ const char* prefix = "[ ='\",\\(]"; /*< ' ','=','(',''',''"',',' are allowed before needle */
const char* suffix = "[^[:alnum:]]"; /*< alpha-num chars aren't allowed after the needle */ const char* suffix = "([^[:alnum:]]|$)"; /*< alpha-num chars aren't allowed after the needle */
char* search_re; char* search_re;
char* newstr; char* newstr;
regex_t re; regex_t re;