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

MXS-1196: Give same argument to both classifiers

Browse Source
This commit is contained in:
Johan Wikman
2017-05-22 13:30:19 +03:00
parent bea8513f9d
commit 8b4e092d26
1 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
query_classifier/test/compare.cc
View File

@ -58,6 +58,7 @@ char USAGE[] =
"-2 the second classifier, default qc_sqlite\n" "-2 the second classifier, default qc_sqlite\n"
"-A arguments for the first classifier\n" "-A arguments for the first classifier\n"
"-B arguments for the second classifier\n" "-B arguments for the second classifier\n"
"-C arguments for both classifiers\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" "-R strict reporting, report if parse result is different\n"
@ -1315,6 +1316,15 @@ int run(QUERY_CLASSIFIER* pClassifier1, QUERY_CLASSIFIER* pClassifier2, const st
return global.n_errors == 0 ? EXIT_SUCCESS : EXIT_FAILURE; return global.n_errors == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
} }
void append_arg(string& args, const string& arg)
{
if (!args.empty())
{
args += ",";
}
args += arg;
}
} }
int main(int argc, char* argv[]) int main(int argc, char* argv[])
@ -1323,7 +1333,7 @@ int main(int argc, char* argv[])
const char* zClassifier1 = "qc_mysqlembedded"; const char* zClassifier1 = "qc_mysqlembedded";
const char* zClassifier2 = "qc_sqlite"; const char* zClassifier2 = "qc_sqlite";
const char* zClassifier1Args = NULL; string classifier1Args;
#if defined(USING_MARIADB_103) #if defined(USING_MARIADB_103)
string classifier2Args("parse_as=10.3,log_unrecognized_statements=1"); string classifier2Args("parse_as=10.3,log_unrecognized_statements=1");
#else #else
@ -1334,7 +1344,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:SR")) != -1) while ((c = getopt(argc, argv, "r:d1:2:v:A:B:C:s:SR")) != -1)
{ {
switch (c) switch (c)
{ {
@ -1355,12 +1365,16 @@ int main(int argc, char* argv[])
break; break;
case 'A': case 'A':
zClassifier1Args = optarg; append_arg(classifier1Args, optarg);
break; break;
case 'B': case 'B':
classifier2Args += ","; append_arg(classifier2Args, optarg);
classifier2Args += optarg; break;
case 'C':
append_arg(classifier1Args, optarg);
append_arg(classifier2Args, optarg);
break; break;
case 'd': case 'd':
@ -1400,6 +1414,7 @@ int main(int argc, char* argv[])
if (mxs_log_init(NULL, ".", MXS_LOG_TARGET_DEFAULT)) if (mxs_log_init(NULL, ".", MXS_LOG_TARGET_DEFAULT))
{ {
const char* zClassifier1Args = classifier1Args.c_str();
const char* zClassifier2Args = classifier2Args.c_str(); const char* zClassifier2Args = classifier2Args.c_str();
QUERY_CLASSIFIER* pClassifier1; QUERY_CLASSIFIER* pClassifier1;