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

MXS-1275: SetSqlModeParser moved under MySQLClient

Browse Source 
That's where it belongs as it is only the mysql client protocol that
will use it. It's a bit unfortunate that the qc test program compare
now needs to include a file from a protocol module directory, but
the fact is that the query classifier implementation and the test
programs should actually be *under* the mysql client protocol module.
This commit is contained in:
Johan Wikman 2017-06-05 10:27:33 +03:00
parent 25314b6662
commit 12a291919a
6 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
query_classifier/test/compare.cc
View File

@ -29,7 +29,7 @@
#include <maxscale/log_manager.h>
#include <maxscale/protocol/mysql.h>
#include <maxscale/query_classifier.h>
#include "../../server/core/maxscale/setsqlmodeparser.hh"
#include "../../server/modules/protocol/MySQL/MySQLClient/setsqlmodeparser.hh"
#include "testreader.hh"
using std::cerr;
using std::cin;
@ -41,7 +41,6 @@ using std::map;
using std::ostream;
using std::string;
using std::stringstream;
using maxscale::SetSqlModeParser;
#if MYSQL_VERSION_MAJOR == 10 && MYSQL_VERSION_MINOR == 3
#define USING_MARIADB_103

3
server/core/test/CMakeLists.txt
View File

@ -12,7 +12,6 @@ add_executable(test_poll testpoll.c)
add_executable(test_queuemanager testqueuemanager.c)
add_executable(test_server testserver.c)
add_executable(test_service testservice.c)
add_executable(test_setsqlmodeparser test_setsqlmodeparser.cc)
add_executable(test_spinlock testspinlock.c)
add_executable(test_trxcompare testtrxcompare.cc ../../../query_classifier/test/testreader.cc)
add_executable(test_trxtracking testtrxtracking.cc)
@ -36,7 +35,6 @@ target_link_libraries(test_poll maxscale-common)
target_link_libraries(test_queuemanager maxscale-common)
target_link_libraries(test_server maxscale-common)
target_link_libraries(test_service maxscale-common)
target_link_libraries(test_setsqlmodeparser maxscale-common)
target_link_libraries(test_spinlock maxscale-common)
target_link_libraries(test_trxcompare maxscale-common)
target_link_libraries(test_trxtracking maxscale-common)
@ -62,7 +60,6 @@ add_test(TestPoll test_poll)
add_test(TestQueueManager test_queuemanager)
add_test(TestServer test_server)
add_test(TestService test_service)
add_test(test_setsqlmodeparser test_setsqlmodeparser)
add_test(TestSpinlock test_spinlock)
add_test(TestUsers test_users)
add_test(TestModulecmd testmodulecmd)

4
server/modules/protocol/MySQL/MySQLClient/CMakeLists.txt
View File

@ -2,3 +2,7 @@ add_library(MySQLClient SHARED mysql_client.cc)
target_link_libraries(MySQLClient maxscale-common MySQLCommon)
set_target_properties(MySQLClient PROPERTIES VERSION "1.0.0")
install_module(MySQLClient core)
if(BUILD_TESTS)
add_subdirectory(test)
endif()

7
server/core/maxscale/setsqlmodeparser.hh → server/modules/protocol/MySQL/MySQLClient/setsqlmodeparser.hh
View File

@ -17,10 +17,7 @@
#include <maxscale/protocol/mysql.h>
namespace maxscale
{
class SetSqlModeParser : public CustomParser
class SetSqlModeParser : public maxscale::CustomParser
{
public:
enum sql_mode_t
@ -652,5 +649,3 @@ private:
return token;
}
};
}

4
server/modules/protocol/MySQL/MySQLClient/test/CMakeLists.txt Normal file
View File

@ -0,0 +1,4 @@
add_executable(test_setsqlmodeparser test_setsqlmodeparser.cc)
target_link_libraries(test_setsqlmodeparser maxscale-common)
add_test(test_setsqlmodeparser test_setsqlmodeparser)

3
server/core/test/test_setsqlmodeparser.cc → server/modules/protocol/MySQL/MySQLClient/test/test_setsqlmodeparser.cc
View File

@ -11,14 +11,13 @@
* Public License.
*/
#include "../core/maxscale/setsqlmodeparser.hh"
#include "../setsqlmodeparser.hh"
#include <stdlib.h>
#include <time.h>
#include <iostream>
#include <maxscale/buffer.h>
#include <maxscale/paths.h>
using namespace maxscale;
using namespace std;
namespace