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

Move thread initialization into Worker::run

Browse Source 
By moving the initialization into Worker::run, all threads, including the
main thread, are properly initialized. This was not noticed before as
qc_sqlite initialized the main thread in the process initialization
callback.
This commit is contained in:
Markus Mäkelä
2017-09-15 17:24:59 +03:00
parent 93dafc9031
commit d00c5b2838
4 changed files with 28 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
query_classifier/qc_sqlite/qc_sqlite.cc
View File

@ -4413,14 +4413,12 @@ static int32_t qc_sqlite_process_init(void)
this_unit.initialized = true;
if (qc_sqlite_thread_init() == 0)
if (this_unit.log_level != QC_LOG_NOTHING)
{
if (this_unit.log_level != QC_LOG_NOTHING)
{
const char* message = NULL;
const char* message = NULL;
switch (this_unit.log_level)
{
switch (this_unit.log_level)
{
case QC_LOG_NON_PARSED:
message = "Statements that cannot be parsed completely are logged.";
break;
@ -4435,16 +4433,9 @@ static int32_t qc_sqlite_process_init(void)
default:
ss_dassert(!true);
}
MXS_NOTICE("%s", message);
}
}
else
{
this_unit.initialized = false;
sqlite3_shutdown();
MXS_NOTICE("%s", message);
}
}
else

5
query_classifier/test/compare.cc
View File

@ -176,8 +176,9 @@ QUERY_CLASSIFIER* get_classifier(const char* zName, qc_sql_mode_t sql_mode, cons
if (pClassifier)
{
if ((pClassifier->qc_setup(sql_mode, zArgs) != QC_RESULT_OK) ||
((pClassifier->qc_process_init() != QC_RESULT_OK)))
if (pClassifier->qc_setup(sql_mode, zArgs) != QC_RESULT_OK ||
pClassifier->qc_process_init() != QC_RESULT_OK ||
pClassifier->qc_thread_init() != QC_RESULT_OK)
{
cerr << "error: Could not setup or init classifier " << zName << "." << endl;
qc_unload(pClassifier);