From d4674faa7da0d64784298e39b3cbee2f3725471f Mon Sep 17 00:00:00 2001 From: Esa Korhonen Date: Tue, 15 Jan 2019 18:05:49 +0200 Subject: [PATCH] Convert maxscale/query_classifier.h to .hh The header was not merged with queryclassifier.hh since the latter does not include the former. --- examples/roundrobinrouter.cpp | 2 +- include/maxscale/config.hh | 2 +- ...query_classifier.h => query_classifier.hh} | 60 +++++++++---------- include/maxscale/routingworker.hh | 2 +- .../qc_mysqlembedded/qc_mysqlembedded.cc | 2 +- query_classifier/qc_sqlite/qc_sqlite.cc | 2 +- query_classifier/test/classify.cc | 2 +- query_classifier/test/compare.cc | 2 +- query_classifier/test/crash_qc_sqlite.cc | 2 +- query_classifier/test/qc_cache.cc | 2 +- query_classifier/test/version_sensitivity.cc | 2 +- server/core/gateway.cc | 2 +- server/core/housekeeper.cc | 2 +- server/core/internal/query_classifier.hh | 2 +- server/core/internal/trxboundaryparser.hh | 2 +- server/core/load_utils.cc | 2 +- server/core/query_classifier.cc | 2 +- server/core/queryclassifier.cc | 2 +- server/core/test/canonical_tests/canonizer.cc | 2 +- server/core/test/test_utils.hh | 2 +- server/modules/filter/cache/cache.cc | 2 +- .../filter/cache/cachefiltersession.cc | 2 +- server/modules/filter/cache/rules.cc | 2 +- .../storage_inmemory/inmemorystorage.cc | 2 +- .../filter/cache/test/testkeygeneration.cc | 2 +- server/modules/filter/cache/test/testrules.cc | 2 +- .../modules/filter/cache/test/teststorage.cc | 2 +- server/modules/filter/ccrfilter/ccrfilter.cc | 2 +- .../modules/filter/dbfwfilter/dbfwfilter.hh | 2 +- .../filter/insertstream/insertstream.cc | 2 +- server/modules/filter/luafilter/luafilter.cc | 2 +- server/modules/filter/maxrows/maxrows.cc | 2 +- server/modules/filter/mqfilter/mqfilter.cc | 2 +- .../test/maxscale/queryclassifiermodule.hh | 2 +- server/modules/filter/test/mock_backend.cc | 2 +- .../filter/throttlefilter/throttlesession.cc | 2 +- server/modules/filter/tpmfilter/tpmfilter.cc | 2 +- .../MySQL/mariadbclient/mysql_client.cc | 2 +- .../modules/routing/avrorouter/avro_file.cc | 2 +- .../routing/readwritesplit/readwritesplit.cc | 2 +- .../routing/readwritesplit/rwsplit_mysql.cc | 2 +- .../schemarouter/schemarouterinstance.cc | 2 +- .../schemarouter/schemaroutersession.cc | 2 +- 43 files changed, 70 insertions(+), 74 deletions(-) rename include/maxscale/{query_classifier.h => query_classifier.hh} (97%) diff --git a/examples/roundrobinrouter.cpp b/examples/roundrobinrouter.cpp index 5d17a7114..19d121c70 100644 --- a/examples/roundrobinrouter.cpp +++ b/examples/roundrobinrouter.cpp @@ -46,7 +46,7 @@ #include #include #include -#include +#include #include // #define DEBUG_RRROUTER diff --git a/include/maxscale/config.hh b/include/maxscale/config.hh index 66e666588..c217ba3aa 100644 --- a/include/maxscale/config.hh +++ b/include/maxscale/config.hh @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include class SERVICE; diff --git a/include/maxscale/query_classifier.h b/include/maxscale/query_classifier.hh similarity index 97% rename from include/maxscale/query_classifier.h rename to include/maxscale/query_classifier.hh index f24326845..133ab6c36 100644 --- a/include/maxscale/query_classifier.h +++ b/include/maxscale/query_classifier.hh @@ -12,38 +12,36 @@ */ #pragma once -#include +#include #include -#include - -MXS_BEGIN_DECLS +#include #define MXS_QUERY_CLASSIFIER_VERSION {3, 0, 0} /** * qc_init_kind_t specifies what kind of initialization should be performed. */ -typedef enum qc_init_kind +enum qc_init_kind_t { QC_INIT_SELF = 0x01, /*< Initialize/finalize the query classifier itself. */ QC_INIT_PLUGIN = 0x02, /*< Initialize/finalize the plugin. */ QC_INIT_BOTH = 0x03 -} qc_init_kind_t; +}; /** * qc_sql_mode_t specifies what should be assumed of the statements * that will be parsed. */ -typedef enum qc_sql_mode +enum qc_sql_mode_t { QC_SQL_MODE_DEFAULT, /*< Assume the statements are MariaDB SQL. */ QC_SQL_MODE_ORACLE /*< Assume the statements are PL/SQL. */ -} qc_sql_mode_t; +}; /** * @c qc_collect_info_t specifies what information should be collected during parsing. */ -typedef enum qc_collect_info +enum qc_collect_info_t { QC_COLLECT_ESSENTIALS = 0x00, /*< Collect only the base minimum. */ QC_COLLECT_TABLES = 0x01, /*< Collect table names. */ @@ -52,14 +50,14 @@ typedef enum qc_collect_info QC_COLLECT_FUNCTIONS = 0x08, /*< Collect function information. */ QC_COLLECT_ALL = (QC_COLLECT_TABLES | QC_COLLECT_DATABASES | QC_COLLECT_FIELDS | QC_COLLECT_FUNCTIONS) -} qc_collect_info_t; +}; /** * qc_query_type_t defines bits that provide information about a * particular statement. * * Note that more than one bit may be set for a single statement. */ -typedef enum qc_query_type +enum qc_query_type_t { QUERY_TYPE_UNKNOWN = 0x000000, /*< Initial value, can't be tested bitwisely */ QUERY_TYPE_LOCAL_READ = 0x000001, /*< Read non-database data, execute in MaxScale:any */ @@ -87,12 +85,12 @@ typedef enum qc_query_type QUERY_TYPE_SHOW_DATABASES = 0x200000, /*< Show list of databases */ QUERY_TYPE_SHOW_TABLES = 0x400000, /*< Show list of tables */ QUERY_TYPE_DEALLOC_PREPARE = 0x1000000 /*< Dealloc named prepare stmt:all */ -} qc_query_type_t; +}; /** * qc_query_op_t defines the operations a particular statement can perform. */ -typedef enum qc_query_op +enum qc_query_op_t { QUERY_OP_UNDEFINED = 0, @@ -113,56 +111,56 @@ typedef enum qc_query_op QUERY_OP_SHOW, QUERY_OP_TRUNCATE, QUERY_OP_UPDATE, -} qc_query_op_t; +}; /** * qc_parse_result_t defines the possible outcomes when a statement is parsed. */ -typedef enum qc_parse_result +enum qc_parse_result_t { QC_QUERY_INVALID = 0, /*< The query was not recognized or could not be parsed. */ QC_QUERY_TOKENIZED = 1, /*< The query was classified based on tokens; incompletely classified. */ QC_QUERY_PARTIALLY_PARSED = 2, /*< The query was only partially parsed; incompletely classified. */ QC_QUERY_PARSED = 3 /*< The query was fully parsed; completely classified. */ -} qc_parse_result_t; +}; /** * QC_FIELD_INFO contains information about a field used in a statement. */ -typedef struct qc_field_info +struct QC_FIELD_INFO { char* database; /** Present if the field is of the form "a.b.c", NULL otherwise. */ char* table; /** Present if the field is of the form "a.b", NULL otherwise. */ char* column; /** Always present. */ -} QC_FIELD_INFO; +}; /** * QC_FUNCTION_INFO contains information about a function used in a statement. */ -typedef struct qc_function_info +struct QC_FUNCTION_INFO { char* name; /** Name of function. */ QC_FIELD_INFO* fields; /** What fields the function accesses. */ uint32_t n_fields;/** The number of fields in @c fields. */ -} QC_FUNCTION_INFO; +}; /** * Each API function returns @c QC_RESULT_OK if the actual parsing process * succeeded, and some error code otherwise. */ -typedef enum qc_result +enum qc_result_t { QC_RESULT_OK, QC_RESULT_ERROR -} qc_result_t; +}; /** * QC_STMT_INFO is an opaque type where the query classifier stores * information about a statement. */ -typedef struct qc_stmt_info +struct QC_STMT_INFO { -} QC_STMT_INFO; +}; /** * QUERY_CLASSIFIER defines the object a query classifier plugin must @@ -171,7 +169,7 @@ typedef struct qc_stmt_info * To a user of the query classifier functionality, it can in general * be ignored. */ -typedef struct query_classifier +struct QUERY_CLASSIFIER { /** * Called once to setup the query classifier @@ -431,27 +429,27 @@ typedef struct query_classifier * @param info The info to be closed. */ void (* qc_info_close)(QC_STMT_INFO* info); -} QUERY_CLASSIFIER; +}; /** * QC_CACHE_PROPERTIES specifies the limits of the query classification cache. */ -typedef struct QC_CACHE_PROPERTIES +struct QC_CACHE_PROPERTIES { int64_t max_size; /** The maximum size of the cache. */ -} QC_CACHE_PROPERTIES; +}; /** * QC_CACHE_STATS provides statistics of the cache. */ -typedef struct QC_CACHE_STATS +struct QC_CACHE_STATS { int64_t size; /** The current size of the cache. */ int64_t inserts; /** The number of inserts. */ int64_t hits; /** The number of hits. */ int64_t misses; /** The number of misses. */ int64_t evictions; /** The number of evictions. */ -} QC_CACHE_STATS; +}; /** * Loads and sets up the default query classifier. @@ -941,5 +939,3 @@ json_t* qc_get_cache_stats_as_json(); * @return The corresponding string. */ const char* qc_result_to_string(qc_parse_result_t result); - -MXS_END_DECLS diff --git a/include/maxscale/routingworker.hh b/include/maxscale/routingworker.hh index 965828737..5a55d76e7 100644 --- a/include/maxscale/routingworker.hh +++ b/include/maxscale/routingworker.hh @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include MXS_BEGIN_DECLS diff --git a/query_classifier/qc_mysqlembedded/qc_mysqlembedded.cc b/query_classifier/qc_mysqlembedded/qc_mysqlembedded.cc index 02c71125d..8debc9fb9 100644 --- a/query_classifier/qc_mysqlembedded/qc_mysqlembedded.cc +++ b/query_classifier/qc_mysqlembedded/qc_mysqlembedded.cc @@ -62,7 +62,7 @@ #include #include -#include +#include #include #include #include diff --git a/query_classifier/qc_sqlite/qc_sqlite.cc b/query_classifier/qc_sqlite/qc_sqlite.cc index c3a174cee..df42e83ce 100644 --- a/query_classifier/qc_sqlite/qc_sqlite.cc +++ b/query_classifier/qc_sqlite/qc_sqlite.cc @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include #include "builtin_functions.h" diff --git a/query_classifier/test/classify.cc b/query_classifier/test/classify.cc index 97323a1b9..e19a714d8 100644 --- a/query_classifier/test/classify.cc +++ b/query_classifier/test/classify.cc @@ -15,7 +15,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/query_classifier/test/compare.cc b/query_classifier/test/compare.cc index 02f501bd5..2be9abbed 100644 --- a/query_classifier/test/compare.cc +++ b/query_classifier/test/compare.cc @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include "../../server/modules/protocol/MySQL/mariadbclient/setsqlmodeparser.hh" #include "testreader.hh" using std::cerr; diff --git a/query_classifier/test/crash_qc_sqlite.cc b/query_classifier/test/crash_qc_sqlite.cc index 3a69b62ec..980462c26 100644 --- a/query_classifier/test/crash_qc_sqlite.cc +++ b/query_classifier/test/crash_qc_sqlite.cc @@ -15,7 +15,7 @@ #include #include #include -#include +#include #define MYSQL_HEADER_LEN 4 diff --git a/query_classifier/test/qc_cache.cc b/query_classifier/test/qc_cache.cc index 8f35b2adb..7d498c05d 100644 --- a/query_classifier/test/qc_cache.cc +++ b/query_classifier/test/qc_cache.cc @@ -16,7 +16,7 @@ #include #include #include -#include +#include #include using namespace std; diff --git a/query_classifier/test/version_sensitivity.cc b/query_classifier/test/version_sensitivity.cc index 33642eacd..e1b366fe7 100644 --- a/query_classifier/test/version_sensitivity.cc +++ b/query_classifier/test/version_sensitivity.cc @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include #include diff --git a/server/core/gateway.cc b/server/core/gateway.cc index 336f56bdd..1418f69e4 100644 --- a/server/core/gateway.cc +++ b/server/core/gateway.cc @@ -55,7 +55,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/server/core/housekeeper.cc b/server/core/housekeeper.cc index 66221c85c..9742463a4 100644 --- a/server/core/housekeeper.cc +++ b/server/core/housekeeper.cc @@ -26,7 +26,7 @@ #include #include #include -#include +#include /** * @file housekeeper.cc Provide a mechanism to run periodic tasks diff --git a/server/core/internal/query_classifier.hh b/server/core/internal/query_classifier.hh index 7fa83fce4..5520159e7 100644 --- a/server/core/internal/query_classifier.hh +++ b/server/core/internal/query_classifier.hh @@ -13,7 +13,7 @@ #pragma once #include -#include +#include #include MXS_BEGIN_DECLS diff --git a/server/core/internal/trxboundaryparser.hh b/server/core/internal/trxboundaryparser.hh index ae81a9a49..50e5a238b 100644 --- a/server/core/internal/trxboundaryparser.hh +++ b/server/core/internal/trxboundaryparser.hh @@ -15,7 +15,7 @@ #include #include #include -#include +#include namespace maxscale { diff --git a/server/core/load_utils.cc b/server/core/load_utils.cc index 46c83df48..7cc65536f 100644 --- a/server/core/load_utils.cc +++ b/server/core/load_utils.cc @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include "internal/modules.hh" #include "internal/config.hh" diff --git a/server/core/query_classifier.cc b/server/core/query_classifier.cc index 901a3bb36..e9fec8d70 100644 --- a/server/core/query_classifier.cc +++ b/server/core/query_classifier.cc @@ -1473,7 +1473,7 @@ std::unique_ptr qc_classify_as_json(const char* zHost, const std::string std::unique_ptr sBuffer(modutil_create_query(statement.c_str())); GWBUF* pBuffer = sBuffer.get(); - qc_parse_result result = qc_parse(pBuffer, QC_COLLECT_ALL); + qc_parse_result_t result = qc_parse(pBuffer, QC_COLLECT_ALL); json_object_set_new(pParams, CN_PARSE_RESULT, json_string(qc_result_to_string(result))); diff --git a/server/core/queryclassifier.cc b/server/core/queryclassifier.cc index 6b6b9868a..29cef1a25 100644 --- a/server/core/queryclassifier.cc +++ b/server/core/queryclassifier.cc @@ -15,7 +15,7 @@ #include #include #include -#include +#include #include namespace diff --git a/server/core/test/canonical_tests/canonizer.cc b/server/core/test/canonical_tests/canonizer.cc index 2e4b09a0e..ed1a7fe06 100644 --- a/server/core/test/canonical_tests/canonizer.cc +++ b/server/core/test/canonical_tests/canonizer.cc @@ -21,7 +21,7 @@ #include #include -#include +#include #include #include #include diff --git a/server/core/test/test_utils.hh b/server/core/test/test_utils.hh index 9a16bde6a..549cc653c 100644 --- a/server/core/test/test_utils.hh +++ b/server/core/test/test_utils.hh @@ -19,7 +19,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/server/modules/filter/cache/cache.cc b/server/modules/filter/cache/cache.cc index 03430b413..f5c6933d1 100644 --- a/server/modules/filter/cache/cache.cc +++ b/server/modules/filter/cache/cache.cc @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include #include "storagefactory.hh" #include "storage.hh" diff --git a/server/modules/filter/cache/cachefiltersession.cc b/server/modules/filter/cache/cachefiltersession.cc index d495a1370..7790403cc 100644 --- a/server/modules/filter/cache/cachefiltersession.cc +++ b/server/modules/filter/cache/cachefiltersession.cc @@ -17,7 +17,7 @@ #include #include #include -#include +#include #include "storage.hh" namespace diff --git a/server/modules/filter/cache/rules.cc b/server/modules/filter/cache/rules.cc index d287fbc81..dfe5d68ba 100644 --- a/server/modules/filter/cache/rules.cc +++ b/server/modules/filter/cache/rules.cc @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include "cachefilter.hh" diff --git a/server/modules/filter/cache/storage/storage_inmemory/inmemorystorage.cc b/server/modules/filter/cache/storage/storage_inmemory/inmemorystorage.cc index 933b95367..8701c8ae8 100644 --- a/server/modules/filter/cache/storage/storage_inmemory/inmemorystorage.cc +++ b/server/modules/filter/cache/storage/storage_inmemory/inmemorystorage.cc @@ -15,7 +15,7 @@ #include "inmemorystorage.hh" #include #include -#include +#include #include "inmemorystoragest.hh" #include "inmemorystoragemt.hh" diff --git a/server/modules/filter/cache/test/testkeygeneration.cc b/server/modules/filter/cache/test/testkeygeneration.cc index e4a921061..00e3143c6 100644 --- a/server/modules/filter/cache/test/testkeygeneration.cc +++ b/server/modules/filter/cache/test/testkeygeneration.cc @@ -17,7 +17,7 @@ #include #include #include -#include +#include #include "storagefactory.hh" #include "cache.hh" #include "cache_storage_api.hh" diff --git a/server/modules/filter/cache/test/testrules.cc b/server/modules/filter/cache/test/testrules.cc index ec7d0cbab..8f6b0b3bc 100644 --- a/server/modules/filter/cache/test/testrules.cc +++ b/server/modules/filter/cache/test/testrules.cc @@ -18,7 +18,7 @@ #include #include #include -#include +#include using namespace std; diff --git a/server/modules/filter/cache/test/teststorage.cc b/server/modules/filter/cache/test/teststorage.cc index 4241ef6e7..1bad3fb3f 100644 --- a/server/modules/filter/cache/test/teststorage.cc +++ b/server/modules/filter/cache/test/teststorage.cc @@ -18,7 +18,7 @@ #include #include -#include +#include #include #include "storagefactory.hh" diff --git a/server/modules/filter/ccrfilter/ccrfilter.cc b/server/modules/filter/ccrfilter/ccrfilter.cc index 27d9d07a4..835e99a1e 100644 --- a/server/modules/filter/ccrfilter/ccrfilter.cc +++ b/server/modules/filter/ccrfilter/ccrfilter.cc @@ -23,7 +23,7 @@ #include #include #include -#include +#include using std::string; diff --git a/server/modules/filter/dbfwfilter/dbfwfilter.hh b/server/modules/filter/dbfwfilter/dbfwfilter.hh index 7c69a25ff..c1a30c5be 100644 --- a/server/modules/filter/dbfwfilter/dbfwfilter.hh +++ b/server/modules/filter/dbfwfilter/dbfwfilter.hh @@ -25,7 +25,7 @@ #include #include -#include +#include #include "dbfwfilter.h" diff --git a/server/modules/filter/insertstream/insertstream.cc b/server/modules/filter/insertstream/insertstream.cc index 479be22eb..81b92559f 100644 --- a/server/modules/filter/insertstream/insertstream.cc +++ b/server/modules/filter/insertstream/insertstream.cc @@ -23,7 +23,7 @@ #include #include #include -#include +#include /** * @file datastream.c - Streaming of bulk inserts diff --git a/server/modules/filter/luafilter/luafilter.cc b/server/modules/filter/luafilter/luafilter.cc index 20d8ac7f7..ff7f3d8dd 100644 --- a/server/modules/filter/luafilter/luafilter.cc +++ b/server/modules/filter/luafilter/luafilter.cc @@ -54,7 +54,7 @@ extern "C" #include #include #include -#include +#include #include /* diff --git a/server/modules/filter/maxrows/maxrows.cc b/server/modules/filter/maxrows/maxrows.cc index ffd9333a2..1c2f58579 100644 --- a/server/modules/filter/maxrows/maxrows.cc +++ b/server/modules/filter/maxrows/maxrows.cc @@ -30,7 +30,7 @@ #include #include #include -#include +#include static MXS_FILTER* createInstance(const char* name, MXS_CONFIG_PARAMETER*); static MXS_FILTER_SESSION* newSession(MXS_FILTER* instance, diff --git a/server/modules/filter/mqfilter/mqfilter.cc b/server/modules/filter/mqfilter/mqfilter.cc index 96c3f75d5..4f7f12537 100644 --- a/server/modules/filter/mqfilter/mqfilter.cc +++ b/server/modules/filter/mqfilter/mqfilter.cc @@ -74,7 +74,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/server/modules/filter/test/maxscale/queryclassifiermodule.hh b/server/modules/filter/test/maxscale/queryclassifiermodule.hh index dc2f1984d..e4dc86613 100644 --- a/server/modules/filter/test/maxscale/queryclassifiermodule.hh +++ b/server/modules/filter/test/maxscale/queryclassifiermodule.hh @@ -14,7 +14,7 @@ #include #include -#include +#include #include "module.hh" namespace maxscale diff --git a/server/modules/filter/test/mock_backend.cc b/server/modules/filter/test/mock_backend.cc index a63f8f88b..048dc5706 100644 --- a/server/modules/filter/test/mock_backend.cc +++ b/server/modules/filter/test/mock_backend.cc @@ -14,7 +14,7 @@ #include "maxscale/mock/backend.hh" #include #include -#include +#include #include #include diff --git a/server/modules/filter/throttlefilter/throttlesession.cc b/server/modules/filter/throttlefilter/throttlesession.cc index 0f0570ff4..f08e15652 100644 --- a/server/modules/filter/throttlefilter/throttlesession.cc +++ b/server/modules/filter/throttlefilter/throttlesession.cc @@ -16,7 +16,7 @@ #include #include #include -#include +#include #include "throttlesession.hh" #include "throttlefilter.hh" diff --git a/server/modules/filter/tpmfilter/tpmfilter.cc b/server/modules/filter/tpmfilter/tpmfilter.cc index 6103a20e1..4617e5aec 100644 --- a/server/modules/filter/tpmfilter/tpmfilter.cc +++ b/server/modules/filter/tpmfilter/tpmfilter.cc @@ -61,7 +61,7 @@ #include #include #include -#include +#include /* The maximum size for query statements in a transaction (64MB) */ static size_t sql_size_limit = 64 * 1024 * 1024; diff --git a/server/modules/protocol/MySQL/mariadbclient/mysql_client.cc b/server/modules/protocol/MySQL/mariadbclient/mysql_client.cc index 27c31fea9..c895bca5a 100644 --- a/server/modules/protocol/MySQL/mariadbclient/mysql_client.cc +++ b/server/modules/protocol/MySQL/mariadbclient/mysql_client.cc @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/server/modules/routing/avrorouter/avro_file.cc b/server/modules/routing/avrorouter/avro_file.cc index 48431e119..5cce203c2 100644 --- a/server/modules/routing/avrorouter/avro_file.cc +++ b/server/modules/routing/avrorouter/avro_file.cc @@ -23,7 +23,7 @@ */ #include "avrorouter.hh" -#include +#include #include #include diff --git a/server/modules/routing/readwritesplit/readwritesplit.cc b/server/modules/routing/readwritesplit/readwritesplit.cc index 0efb64b86..7dda1d50e 100644 --- a/server/modules/routing/readwritesplit/readwritesplit.cc +++ b/server/modules/routing/readwritesplit/readwritesplit.cc @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/server/modules/routing/readwritesplit/rwsplit_mysql.cc b/server/modules/routing/readwritesplit/rwsplit_mysql.cc index 915700c20..95c624925 100644 --- a/server/modules/routing/readwritesplit/rwsplit_mysql.cc +++ b/server/modules/routing/readwritesplit/rwsplit_mysql.cc @@ -20,7 +20,7 @@ #include #include -#include +#include #include #include #include diff --git a/server/modules/routing/schemarouter/schemarouterinstance.cc b/server/modules/routing/schemarouter/schemarouterinstance.cc index 61e9a10ce..31a8d722c 100644 --- a/server/modules/routing/schemarouter/schemarouterinstance.cc +++ b/server/modules/routing/schemarouter/schemarouterinstance.cc @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include diff --git a/server/modules/routing/schemarouter/schemaroutersession.cc b/server/modules/routing/schemarouter/schemaroutersession.cc index a0ec8ec0f..b78c954d0 100644 --- a/server/modules/routing/schemarouter/schemaroutersession.cc +++ b/server/modules/routing/schemarouter/schemaroutersession.cc @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include namespace schemarouter