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

MXS-1339 QC: Report each table just once

Browse Source 
If a particular table appears in a statement multiple times,
qc_get_table_names will report it as many times as it appears.
Each name should be reported just once. Same applies for
database names.
This commit is contained in:
Johan Wikman
2017-08-02 10:51:35 +03:00
parent d5de149e32
commit 7a5e3ede21
2 changed files with 125 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
query_classifier/qc_mysqlembedded/qc_mysqlembedded.cc
View File

@ -1552,16 +1552,31 @@ int32_t qc_mysql_get_table_names(GWBUF* querybuf, int32_t fullnames, char*** tab
}
}
if (catnm)
{
tables[i++] = catnm;
}
else
if (!catnm)
{
// Sometimes the tablename is "*"; we exclude that.
if (strcmp(tbl->table_name, "*") != 0)
{
tables[i++] = strdup(tbl->table_name);
catnm = strdup(tbl->table_name);
}
}
if (catnm)
{
int j = 0;
while ((j < i) && (strcmp(catnm, tables[j]) != 0))
{
++j;
}
if (j == i) // Not found
{
tables[i++] = catnm;
}
else
{
free(catnm);
}
}
@ -1854,7 +1869,17 @@ int32_t qc_mysql_get_database_names(GWBUF* querybuf, char*** databasesp, int* si
currsz = currsz * 2 + 1;
}
databases[i++] = strdup(tbl->db);
int j = 0;
while ((j < i) && (strcmp(tbl->db, databases[j]) != 0))
{
++j;
}
if (j == i) // Not found
{
databases[i++] = strdup(tbl->db);
}
}
tbl = tbl->next_local;