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

Format query classifier modules

Browse Source 
Formatted query classifier modules with Astyle.
This commit is contained in:
Markus Mäkelä
2017-01-17 13:51:57 +02:00
parent a48be9badf
commit 3d92263cb3
4 changed files with 519 additions and 493 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
query_classifier/qc_mysqlembedded/qc_mysqlembedded.cc
View File

@ -1297,7 +1297,7 @@ int32_t qc_mysql_get_table_names(GWBUF* querybuf, int32_t fullnames, char*** tab
{ {
if (i >= currtblsz) if (i >= currtblsz)
{ {
tmp = (char**) malloc(sizeof (char*)*(currtblsz * 2 + 1)); tmp = (char**) malloc(sizeof (char*) * (currtblsz * 2 + 1));
if (tmp) if (tmp)
{ {
@ -1616,7 +1616,7 @@ int32_t qc_mysql_get_database_names(GWBUF* querybuf, char*** databasesp, int* si
if (i >= currsz) if (i >= currsz)
{ {
tmp = (char**) realloc(databases, tmp = (char**) realloc(databases,
sizeof (char*)*(currsz * 2 + 1)); sizeof (char*) * (currsz * 2 + 1));
if (tmp == NULL) if (tmp == NULL)
{ {
@ -2609,7 +2609,8 @@ const int IDX_DATADIR = 2;
const int IDX_LANGUAGE = 3; const int IDX_LANGUAGE = 3;
const int N_OPTIONS = (sizeof(server_options) / sizeof(server_options[0])) - 1; const int N_OPTIONS = (sizeof(server_options) / sizeof(server_options[0])) - 1;
const char* server_groups[] = { const char* server_groups[] =
{
"embedded", "embedded",
"server", "server",
"server", "server",
@ -2720,8 +2721,8 @@ void qc_mysql_thread_end(void)
extern "C" extern "C"
{ {
MXS_MODULE* MXS_CREATE_MODULE() MXS_MODULE* MXS_CREATE_MODULE()
{ {
static QUERY_CLASSIFIER qc = static QUERY_CLASSIFIER qc =
{ {
qc_mysql_setup, qc_mysql_setup,
@ -2762,6 +2763,6 @@ MXS_MODULE* MXS_CREATE_MODULE()
}; };
return &info; return &info;
} }
} }

4
query_classifier/test/canonical_tests/canonizer.c
View File

@ -49,8 +49,8 @@ int main(int argc, char** argv)
qc_setup("qc_sqlite", NULL); qc_setup("qc_sqlite", NULL);
qc_process_init(); qc_process_init();
infile = fopen(argv[1],"rb"); infile = fopen(argv[1], "rb");
outfile = fopen(argv[2],"wb"); outfile = fopen(argv[2], "wb");
if (infile == NULL || outfile == NULL) if (infile == NULL || outfile == NULL)
{ {

69
query_classifier/test/testmain.c
View File

@ -12,7 +12,8 @@
static char datadir[1024] = ""; static char datadir[1024] = "";
static char mysqldir[1024] = ""; static char mysqldir[1024] = "";
static char* server_options[] = { static char* server_options[] =
{
"MariaDB Corporation MaxScale", "MariaDB Corporation MaxScale",
"--datadir=", "--datadir=",
"--default-storage-engine=myisam", "--default-storage-engine=myisam",
@ -21,7 +22,8 @@ static char* server_options[] = {
const int num_elements = (sizeof(server_options) / sizeof(char *)) - 1; const int num_elements = (sizeof(server_options) / sizeof(char *)) - 1;
static char* server_groups[] = { static char* server_groups[] =
{
"embedded", "embedded",
"server", "server",
"server", "server",
@ -38,7 +40,8 @@ static void slcursor_add_case(
typedef struct query_test_st query_test_t; typedef struct query_test_st query_test_t;
struct query_test_st { struct query_test_st
{
skygw_chk_t qt_chk_top; skygw_chk_t qt_chk_top;
const char* qt_query_str; const char* qt_query_str;
skygw_query_type_t qt_query_type; skygw_query_type_t qt_query_type;
@ -352,19 +355,24 @@ int main(int argc, char** argv)
*/ */
workingdir = getenv("PWD"); workingdir = getenv("PWD");
if (workingdir == NULL) { if (workingdir == NULL)
{
fprintf(stderr, fprintf(stderr,
"Failed to resolve the working directory, $PWD is not " "Failed to resolve the working directory, $PWD is not "
"set.\n"); "set.\n");
ss_dassert(workingdir != NULL); ss_dassert(workingdir != NULL);
} else if (access(workingdir, R_OK) != 0) { }
else if (access(workingdir, R_OK) != 0)
{
char errbuf[STRERROR_BUFLEN]; char errbuf[STRERROR_BUFLEN];
fprintf(stderr, fprintf(stderr,
"Failed to access the working directory due %d, %s\n", "Failed to access the working directory due %d, %s\n",
errno, errno,
strerror_r(errno, errbuf, sizeof(errbuf))); strerror_r(errno, errbuf, sizeof(errbuf)));
ss_dassert(false); ss_dassert(false);
} else { }
else
{
char** so = server_options; char** so = server_options;
snprintf(datadir, 1023, "%s/data", workingdir); snprintf(datadir, 1023, "%s/data", workingdir);
mkdir(datadir, 0777); mkdir(datadir, 0777);
@ -372,7 +380,8 @@ int main(int argc, char** argv)
while (strncmp(*so++, "--datadir=", 10) != 0) ; while (strncmp(*so++, "--datadir=", 10) != 0) ;
if (*so == NULL) { if (*so == NULL)
{
fprintf(stderr, "Failed to find datadir option.\n"); fprintf(stderr, "Failed to find datadir option.\n");
ss_dassert(*so != NULL); ss_dassert(*so != NULL);
} }
@ -383,7 +392,8 @@ int main(int argc, char** argv)
} }
failp = mysql_library_init(num_elements, server_options, server_groups); failp = mysql_library_init(num_elements, server_options, server_groups);
if (failp) { if (failp)
{
MYSQL* mysql = mysql_init(NULL); MYSQL* mysql = mysql_init(NULL);
ss_dassert(mysql != NULL); ss_dassert(mysql != NULL);
fprintf(stderr, fprintf(stderr,
@ -402,7 +412,8 @@ int main(int argc, char** argv)
*/ */
succp = slcursor_move_to_begin(c); succp = slcursor_move_to_begin(c);
while(succp) { while (succp)
{
qtest = slcursor_get_case(c); qtest = slcursor_get_case(c);
qtest->qt_result_type = qtest->qt_result_type =
skygw_query_classifier_get_type(qtest->qt_query_str, f, skygw_query_classifier_get_type(qtest->qt_query_str, f,
@ -416,17 +427,21 @@ int main(int argc, char** argv)
succp = slcursor_move_to_begin(c); succp = slcursor_move_to_begin(c);
fprintf(stderr, "\nScanning through the results :\n\n"); fprintf(stderr, "\nScanning through the results :\n\n");
while(succp) { while (succp)
{
qtest = slcursor_get_case(c); qtest = slcursor_get_case(c);
if (!query_test_types_match(qtest)) { if (!query_test_types_match(qtest))
{
nfail += 1; nfail += 1;
ss_dfprintf(stderr, ss_dfprintf(stderr,
"* Failed: \"%s\" -> %s (Expected %s)\n", "* Failed: \"%s\" -> %s (Expected %s)\n",
query_test_get_querystr(qtest), query_test_get_querystr(qtest),
STRQTYPE(query_test_get_result_type(qtest)), STRQTYPE(query_test_get_result_type(qtest)),
STRQTYPE(query_test_get_query_type(qtest))); STRQTYPE(query_test_get_query_type(qtest)));
} else { }
else
{
nsucc += 1; nsucc += 1;
ss_dfprintf(stderr, ss_dfprintf(stderr,
"Succeed\t: \"%s\" -> %s\n", "Succeed\t: \"%s\" -> %s\n",
@ -438,7 +453,7 @@ int main(int argc, char** argv)
fprintf(stderr, fprintf(stderr,
"------------------------------------------\n" "------------------------------------------\n"
"Tests in total %d, SUCCEED %d, FAILED %d\n", "Tests in total %d, SUCCEED %d, FAILED %d\n",
nsucc+nfail, nsucc + nfail,
nsucc, nsucc,
nfail); nfail);
@ -449,7 +464,8 @@ int main(int argc, char** argv)
succp = slcursor_move_to_begin(c); succp = slcursor_move_to_begin(c);
mysql = mysql_init(NULL); mysql = mysql_init(NULL);
if (mysql == NULL) { if (mysql == NULL)
{
fprintf(stderr, "mysql_init failed\n"); fprintf(stderr, "mysql_init failed\n");
ss_dassert(mysql != NULL); ss_dassert(mysql != NULL);
} }
@ -469,7 +485,8 @@ int main(int argc, char** argv)
NULL, NULL,
CLIENT_MULTI_STATEMENTS); CLIENT_MULTI_STATEMENTS);
if (mysql == NULL) { if (mysql == NULL)
{
fprintf(stderr, "mysql_real_connect failed\n"); fprintf(stderr, "mysql_real_connect failed\n");
ss_dassert(mysql != NULL); ss_dassert(mysql != NULL);
} }
@ -477,10 +494,12 @@ int main(int argc, char** argv)
fprintf(stderr, fprintf(stderr,
"\nRe-execution of selected cases in Embedded server :\n\n"); "\nRe-execution of selected cases in Embedded server :\n\n");
while(succp) { while (succp)
{
qtest = slcursor_get_case(c); qtest = slcursor_get_case(c);
if (query_test_exec_also_in_server(qtest)) { if (query_test_exec_also_in_server(qtest))
{
MYSQL_RES* results; MYSQL_RES* results;
MYSQL_ROW record; MYSQL_ROW record;
const char* query_str; const char* query_str;
@ -488,22 +507,28 @@ int main(int argc, char** argv)
query_str = query_test_get_querystr(qtest); query_str = query_test_get_querystr(qtest);
failp = mysql_query(mysql, query_str); failp = mysql_query(mysql, query_str);
if (failp) { if (failp)
{
ss_dfprintf(stderr, ss_dfprintf(stderr,
"* Failed: \"%s\" -> %d : %s\n", "* Failed: \"%s\" -> %d : %s\n",
query_str, query_str,
mysql_errno(mysql), mysql_errno(mysql),
mysql_error(mysql)); mysql_error(mysql));
} else { }
else
{
ss_dfprintf(stderr, ss_dfprintf(stderr,
"Succeed\t: \"%s\"\n", "Succeed\t: \"%s\"\n",
query_str); query_str);
results = mysql_store_result(mysql); results = mysql_store_result(mysql);
if (results != NULL) { if (results != NULL)
{
while((record = mysql_fetch_row(results))) { while ((record = mysql_fetch_row(results)))
while(record != NULL && *record != NULL) { {
while (record != NULL && *record != NULL)
{
ss_dfprintf(stderr, "%s ", *record); ss_dfprintf(stderr, "%s ", *record);
record++; record++;
} }