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

MXS-680: qc_mysqlembedded does not look into functions

Browse Source 
qc_mysqlembedded does not look into functions when collecting
the affected fields of a query. Therefore the affected fields
of a query like

    SELECT concat(a, "", "") from X where b = 1;

will be "b" and not "a b" as it should be.
This commit is contained in:
Johan Wikman
2016-04-21 12:56:07 +03:00
parent eb1a30e9ac
commit d5d0547a57
1 changed files with 6 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
query_classifier/qc_mysqlembedded/qc_mysqlembedded.cc
View File

@ -1320,7 +1320,7 @@ inline void add_str(char** buf, int* buflen, int* bufsize, char* str)
} }
static void collect_where(Item* item, char** bufp, int* buflenp, int* bufsizep) static void collect_affected_fields(Item* item, char** bufp, int* buflenp, int* bufsizep)
{ {
switch (item->type()) switch (item->type())
{ {
@ -1332,7 +1332,7 @@ static void collect_where(Item* item, char** bufp, int* buflenp, int* bufsizep)
for (; item != NULL; item = (Item*) ilist.next()) for (; item != NULL; item = (Item*) ilist.next())
{ {
collect_where(item, bufp, buflenp, bufsizep); collect_affected_fields(item, bufp, buflenp, bufsizep);
} }
} }
break; break;
@ -1352,7 +1352,7 @@ static void collect_where(Item* item, char** bufp, int* buflenp, int* bufsizep)
for (size_t i = 0; i < n_items; ++i) for (size_t i = 0; i < n_items; ++i)
{ {
collect_where(items[i], bufp, buflenp, bufsizep); collect_affected_fields(items[i], bufp, buflenp, bufsizep);
} }
} }
break; break;
@ -1408,32 +1408,17 @@ char* qc_get_affected_fields(GWBUF* buf)
for (; item != NULL; item = (Item*) ilist.next()) for (; item != NULL; item = (Item*) ilist.next())
{ {
collect_affected_fields(item, &where, &buffsz, &bufflen);
itype = item->type();
if (item->name && itype == Item::FIELD_ITEM)
{
add_str(&where, &buffsz, &bufflen, item->name);
}
} }
if (lex->current_select->where) if (lex->current_select->where)
{ {
collect_where(lex->current_select->where, &where, &buffsz, &bufflen); collect_affected_fields(lex->current_select->where, &where, &buffsz, &bufflen);
} }
if (lex->current_select->having) if (lex->current_select->having)
{ {
for (item = lex->current_select->having; item != NULL; item = item->next) collect_affected_fields(lex->current_select->having, &where, &buffsz, &bufflen);
{
itype = item->type();
if (item->name && itype == Item::FIELD_ITEM)
{
add_str(&where, &buffsz, &bufflen, item->name);
}
}
} }
lex->current_select = lex->current_select->next_select_in_list(); lex->current_select = lex->current_select->next_select_in_list();