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

MXS-1196: Extend flags of compare

Browse Source 
Sometimes you want to know whether the parsing using different
queryclassifiers differs, irrespective of whether they agree
upon the outcome or not.

With -R it is now possible to cause a difference in the return
value of qc_parse() to be printed.
This commit is contained in:
Johan Wikman
2017-05-02 16:04:41 +03:00
parent 62a64cba31
commit cd6e9fa44b
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
query_classifier/test/compare.cc
View File

@ -53,6 +53,7 @@ char USAGE[] =
"-B arguments for the second classifier\n" "-B arguments for the second classifier\n"
"-s compare single statement\n" "-s compare single statement\n"
"-S strict, also require that the parse result is identical\n" "-S strict, also require that the parse result is identical\n"
"-R strict reporting, report if parse result is different\n"
"-v 0, only return code\n" "-v 0, only return code\n"
" 1, query and result for failed cases\n" " 1, query and result for failed cases\n"
" 2, all queries, and result for failed cases\n" " 2, all queries, and result for failed cases\n"
@ -75,6 +76,7 @@ struct State
bool result_printed; bool result_printed;
bool stop_at_error; bool stop_at_error;
bool strict; bool strict;
bool strict_reporting;
size_t line; size_t line;
size_t n_statements; size_t n_statements;
size_t n_errors; size_t n_errors;
@ -87,6 +89,7 @@ struct State
false, // result_printed false, // result_printed
true, // stop_at_error true, // stop_at_error
false, // strict false, // strict
false, // strict reporting
0, // line 0, // line
0, // n_statements 0, // n_statements
0, // n_errors 0, // n_errors
@ -339,7 +342,10 @@ bool compare_parse(QUERY_CLASSIFIER* pClassifier1, GWBUF* pCopy1,
else else
{ {
ss << "INF: "; ss << "INF: ";
success = true; if (!global.strict_reporting)
{
success = true;
}
} }
ss << static_cast<qc_parse_result_t>(rv1) << " != " << static_cast<qc_parse_result_t>(rv2); ss << static_cast<qc_parse_result_t>(rv1) << " != " << static_cast<qc_parse_result_t>(rv2);
@ -1317,7 +1323,7 @@ int main(int argc, char* argv[])
size_t rounds = 1; size_t rounds = 1;
int v = VERBOSITY_NORMAL; int v = VERBOSITY_NORMAL;
int c; int c;
while ((c = getopt(argc, argv, "r:d1:2:v:A:B:s:S")) != -1) while ((c = getopt(argc, argv, "r:d1:2:v:A:B:s:SR")) != -1)
{ {
switch (c) switch (c)
{ {
@ -1357,6 +1363,10 @@ int main(int argc, char* argv[])
global.strict = true; global.strict = true;
break; break;
case 'R':
global.strict_reporting = true;
break;
default: default:
rc = EXIT_FAILURE; rc = EXIT_FAILURE;
break; break;