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

Merge branch '2.3' into develop

Browse Source
This commit is contained in:
Markus Mäkelä 2019-02-07 10:50:27 +02:00
commit 42b5c39f43
No known key found for this signature in database
GPG Key ID: 72D48FCE664F7B19
12 changed files with 85 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cmake/init_scripts.cmake
View File

@ -25,6 +25,15 @@ else()
endif()
configure_file(${CMAKE_SOURCE_DIR}/etc/maxscale.conf.in ${CMAKE_BINARY_DIR}/maxscale.conf @ONLY)
# The systemd service file
if (CMAKE_BUILD_TYPE MATCHES "(D|d)(E|e)(B|b)(U|u)(G|g)")
# Options enabled only in debug builds (a literal multi-line string)
set(SERVICE_FILE_DEBUG_OPTIONS
"LimitCORE=infinity
ExecStartPost=/bin/sh -c 'prlimit -p $(pidof maxscale) --core=unlimited'")
endif()
configure_file(${CMAKE_SOURCE_DIR}/etc/maxscale.service.in ${CMAKE_BINARY_DIR}/maxscale.service @ONLY)
if(PACKAGE)

1
etc/maxscale.service.in
View File

@ -5,6 +5,7 @@ After=network.target
[Service]
Type=forking
Restart=on-abort
@SERVICE_FILE_DEBUG_OPTIONS@
# Make sure /var/run/maxscale exists
PermissionsStartOnly=true

2
include/maxscale/router.hh
View File

@ -420,7 +420,7 @@ public:
static MXS_ROUTER_SESSION* newSession(MXS_ROUTER* pInstance, MXS_SESSION* pSession)
{
RouterType* pRouter = static_cast<RouterType*>(pInstance);
RouterSessionType* pRouter_session;
RouterSessionType* pRouter_session = nullptr;
MXS_EXCEPTION_GUARD(pRouter_session = pRouter->newSession(pSession));

10
query_classifier/qc_sqlite/qc_sqlite.cc
View File

@ -3362,7 +3362,7 @@ extern "C"
// 'unsigned int' and not 'uint32_t' because 'uint32_t' is unknown in sqlite3 context.
extern void maxscale_set_type_mask(unsigned int type_mask);
extern void maxscaleComment();
extern int maxscaleComment();
extern int maxscaleKeyword(int token);
extern int maxscaleTranslateKeyword(int token);
}
@ -4190,14 +4190,18 @@ void maxscaleCreateSequence(Parse* pParse, Token* pDatabase, Token* pTable)
QC_EXCEPTION_GUARD(pInfo->maxscaleCreateSequence(pParse, pDatabase, pTable));
}
void maxscaleComment()
int maxscaleComment()
{
QC_TRACE();
QcSqliteInfo* pInfo = this_thread.pInfo;
mxb_assert(pInfo);
QC_EXCEPTION_GUARD(pInfo->maxscaleComment());
int rc = 0;
QC_EXCEPTION_GUARD(rc = pInfo->maxscaleComment());
return rc;
}
void maxscaleDeclare(Parse* pParse)

24
query_classifier/test/CMakeLists.txt
View File

@ -17,24 +17,26 @@ if (BUILD_QC_MYSQLEMBEDDED)
file(COPY ${ERRMSG} DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
endif()
endif()
endif()
add_executable(classify classify.cc)
target_link_libraries(classify maxscale-common)
add_executable(classify classify.cc)
target_link_libraries(classify maxscale-common)
add_executable(compare compare.cc testreader.cc)
target_link_libraries(compare maxscale-common)
add_executable(compare compare.cc testreader.cc)
target_link_libraries(compare maxscale-common)
add_executable(qc_cache qc_cache.cc)
target_link_libraries(qc_cache maxscale-common)
add_executable(qc_cache qc_cache.cc)
target_link_libraries(qc_cache maxscale-common)
add_executable(version_sensitivity version_sensitivity.cc)
target_link_libraries(version_sensitivity maxscale-common)
add_executable(version_sensitivity version_sensitivity.cc)
target_link_libraries(version_sensitivity maxscale-common)
add_executable(crash_qc_sqlite crash_qc_sqlite.cc)
target_link_libraries(crash_qc_sqlite maxscale-common)
add_executable(crash_qc_sqlite crash_qc_sqlite.cc)
target_link_libraries(crash_qc_sqlite maxscale-common)
add_test(TestQC_Crash_qcsqlite crash_qc_sqlite)
add_test(TestQC_Crash_qcsqlite crash_qc_sqlite)
if (BUILD_QC_MYSQLEMBEDDED)
# TestQC_MySQLEmbedded excluded, classify is now solely used for verifying the
# functionality of qc_sqlite.
#add_test(TestQC_MySQLEmbedded classify qc_mysqlembedded ${CMAKE_CURRENT_SOURCE_DIR}/input.sql ${CMAKE_CURRENT_SOURCE_DIR}/expected.sql)

67
query_classifier/test/compare.cc
View File

@ -20,7 +20,6 @@
#include <set>
#include <string>
#include <sstream>
#include <my_config.h>
#include <maxscale/paths.h>
#include <maxscale/log.hh>
#include <maxscale/protocol/mysql.hh>
@ -48,10 +47,11 @@ namespace
{
char USAGE[] =
"usage: compare [-r count] [-d] [-1 classfier1] [-2 classifier2] "
"usage: compare [-r count] [-d] [-0 classifier] [-1 classfier1] [-2 classifier2] "
"[-A args] [-B args] [-C args] [-m [default|oracle]] [-v [0..2]] [-s statement]|[file]]\n\n"
"-r redo the test the specified number of times; 0 means forever, default is 1\n"
"-d don't stop after first failed query\n"
"-0 sanity check mode, compares the statement twice with the same classifier\n"
"-1 the first classifier, default 'qc_mysqlembedded'\n"
"-2 the second classifier, default 'qc_sqlite'\n"
"-A arguments for the first classifier\n"
@ -172,17 +172,22 @@ QUERY_CLASSIFIER* load_classifier(const char* name)
QUERY_CLASSIFIER* get_classifier(const char* zName, qc_sql_mode_t sql_mode, const char* zArgs)
{
QUERY_CLASSIFIER* pClassifier = load_classifier(zName);
QUERY_CLASSIFIER* pClassifier = nullptr;
if (pClassifier)
if (zName)
{
if (pClassifier->qc_setup(sql_mode, zArgs) != QC_RESULT_OK
|| pClassifier->qc_process_init() != QC_RESULT_OK
|| pClassifier->qc_thread_init() != QC_RESULT_OK)
pClassifier = load_classifier(zName);
if (pClassifier)
{
cerr << "error: Could not setup or init classifier " << zName << "." << endl;
qc_unload(pClassifier);
pClassifier = 0;
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);
pClassifier = 0;
}
}
}
@ -209,21 +214,18 @@ bool get_classifiers(qc_sql_mode_t sql_mode,
bool rc = false;
QUERY_CLASSIFIER* pClassifier1 = get_classifier(zName1, sql_mode, zArgs1);
QUERY_CLASSIFIER* pClassifier2 = get_classifier(zName2, sql_mode, zArgs2);
if (pClassifier1)
if ((!zName1 || pClassifier1) && (!zName2 || pClassifier2))
{
QUERY_CLASSIFIER* pClassifier2 = get_classifier(zName2, sql_mode, zArgs2);
if (pClassifier2)
{
*ppClassifier1 = pClassifier1;
*ppClassifier2 = pClassifier2;
rc = true;
}
else
{
put_classifier(pClassifier1);
}
*ppClassifier1 = pClassifier1;
*ppClassifier2 = pClassifier2;
rc = true;
}
else
{
put_classifier(pClassifier1);
put_classifier(pClassifier2);
}
return rc;
@ -1494,11 +1496,12 @@ int main(int argc, char* argv[])
#endif
const char* zStatement = NULL;
qc_sql_mode_t sql_mode = QC_SQL_MODE_DEFAULT;
bool solo = false;
size_t rounds = 1;
int v = VERBOSITY_NORMAL;
int c;
while ((c = getopt(argc, argv, "r:d1:2:v:A:B:C:m:s:SR")) != -1)
while ((c = getopt(argc, argv, "r:d0:1:2:v:A:B:C:m:s:SR")) != -1)
{
switch (c)
{
@ -1510,6 +1513,12 @@ int main(int argc, char* argv[])
v = atoi(optarg);
break;
case '0':
zClassifier1 = optarg;
zClassifier2 = nullptr;
solo = true;
break;
case '1':
zClassifier1 = optarg;
break;
@ -1601,6 +1610,11 @@ int main(int argc, char* argv[])
size_t round = 0;
bool terminate = false;
if (solo)
{
pClassifier2 = pClassifier1;
}
pClassifier1->qc_set_server_version(version);
pClassifier2->qc_set_server_version(version);
@ -1649,6 +1663,11 @@ int main(int argc, char* argv[])
}
while (!terminate && ((rounds == 0) || (round < rounds)));
if (solo)
{
pClassifier2 = nullptr;
}
put_classifiers(pClassifier1, pClassifier2);
cout << "\n";

2
server/modules/filter/cache/test/testkeygeneration.cc vendored
View File

@ -122,7 +122,7 @@ int test(StorageFactory& factory, istream& in)
int main(int argc, char* argv[])
{
int rv = EXIT_FAILURE;
StorageFactory* pFactory;
StorageFactory* pFactory = nullptr;
if ((argc == 2) || (argc == 3))
{
char* libdir = MXS_STRDUP("../../../../../query_classifier/qc_sqlite/");

4
server/modules/filter/hintfilter/hintparser.cc
View File

@ -130,7 +130,9 @@ HINT* hint_parser(HINT_SESSION* session, GWBUF* request)
int len, residual, state;
int found, escape, quoted, squoted;
HINT* rval = NULL;
char* pname, * lvalue, * hintname = NULL;
char* pname = nullptr;
char* lvalue = nullptr;
char* hintname = nullptr;
GWBUF* buf;
HINT_TOKEN* tok;
HINT_MODE mode = HM_EXECUTE;

2
server/modules/filter/tpmfilter/tpmfilter.cc
View File

@ -739,7 +739,7 @@ static void destroyInstance(MXS_FILTER* instance)
static void checkNamedPipe(TPM_INSTANCE* inst)
{
int ret;
int ret = 0;
char buffer[2];
char buf[4096];
char* named_pipe = inst->named_pipe;

2
server/modules/protocol/MySQL/mariadbclient/setsqlmodeparser.hh
View File

@ -487,7 +487,7 @@ private:
{
result_t rv = IS_SET_SQL_MODE;
char c;
char c = *pSql_mode;
do
{

3
server/modules/routing/avrorouter/avro_schema.cc
View File

@ -57,7 +57,8 @@ bool json_extract_field_names(const char* filename, std::vector<Column>& columns
bool rval = false;
json_error_t err;
err.text[0] = '\0';
json_t* obj, * arr;
json_t* obj;
json_t* arr = nullptr;
if ((obj = json_load_file(filename, 0, &err)) && (arr = json_object_get(obj, "fields")))
{

6
server/modules/routing/binlogrouter/blr_master.cc
View File

@ -3063,17 +3063,17 @@ void blr_handle_fake_gtid_list(ROUTER_INSTANCE* router,
static bool blr_handle_missing_files(ROUTER_INSTANCE* router,
char* new_file)
{
char* fptr;
char* fptr = strrchr(new_file, '.');
uint32_t new_fseqno;
uint32_t curr_fseqno;
char buf[BLRM_BINLOG_NAME_STR_LEN];
char bigbuf[PATH_MAX + 1];
if (*new_file
&& (fptr = strrchr(new_file, '.')) == NULL)
if (fptr == NULL)
{
return false;
}
if (router->fileroot)
{
MXS_FREE(router->fileroot);