From 97bb7e7e1abb699470bdb078d72fcc5881ffa861 Mon Sep 17 00:00:00 2001 From: Esa Korhonen Date: Mon, 3 Dec 2018 12:38:05 +0200 Subject: [PATCH] MXS-2205 Combine maxscale/modutil.h with maxscale/modutil.hh --- examples/roundrobinrouter.cpp | 2 +- include/maxscale/customparser.hh | 2 +- include/maxscale/modutil.h | 126 ------------------ include/maxscale/modutil.hh | 107 ++++++++++++++- include/maxscale/protocol/rwbackend.hh | 2 +- query_classifier/qc_sqlite/qc_sqlite.cc | 2 +- server/core/authenticator.cc | 2 +- server/core/modutil.cc | 2 +- server/core/queryclassifier.cc | 2 +- server/core/session.cc | 2 +- server/core/session_command.cc | 2 +- server/core/test/test_modutil.cc | 2 +- server/core/test/test_trxtracking.cc | 2 +- .../CDCPlainAuth/cdc_plain_auth.cc | 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 +- server/modules/filter/ccrfilter/ccrfilter.cc | 2 +- .../modules/filter/dbfwfilter/dbfwfilter.cc | 2 +- server/modules/filter/dbfwfilter/rules.cc | 2 +- server/modules/filter/dbfwfilter/user.cc | 2 +- .../modules/filter/hintfilter/hintfilter.cc | 2 +- .../modules/filter/hintfilter/hintparser.cc | 2 +- .../filter/insertstream/insertstream.cc | 2 +- server/modules/filter/luafilter/luafilter.cc | 2 +- .../filter/masking/maskingfiltersession.cc | 2 +- server/modules/filter/maxrows/maxrows.cc | 2 +- server/modules/filter/mqfilter/mqfilter.cc | 2 +- .../namedserverfilter/namedserverfilter.cc | 2 +- server/modules/filter/qlafilter/qlafilter.cc | 2 +- .../modules/filter/regexfilter/regexfilter.cc | 2 +- server/modules/filter/tee/teesession.cc | 2 +- .../modules/filter/test/maxscale/mock/mock.hh | 2 +- .../filter/throttlefilter/throttlesession.cc | 2 +- server/modules/filter/topfilter/topfilter.cc | 2 +- server/modules/filter/tpmfilter/tpmfilter.cc | 2 +- .../monitor/mariadbmon/cluster_discovery.cc | 2 +- .../MySQL/mariadbbackend/mysql_backend.cc | 2 +- .../MySQL/mariadbclient/mysql_client.cc | 2 +- server/modules/protocol/MySQL/mysql_common.cc | 2 +- server/modules/protocol/MySQL/rwbackend.cc | 2 +- server/modules/routing/cat/catsession.cc | 2 +- server/modules/routing/maxinfo/maxinfo.cc | 2 +- .../modules/routing/maxinfo/maxinfo_error.cc | 2 +- .../modules/routing/maxinfo/maxinfo_exec.cc | 2 +- .../modules/routing/maxinfo/maxinfo_parse.cc | 2 +- .../routing/readconnroute/readconnroute.cc | 2 +- .../routing/readwritesplit/readwritesplit.cc | 2 +- .../routing/readwritesplit/rwsplit_mysql.cc | 2 +- .../readwritesplit/rwsplit_route_stmt.cc | 2 +- .../routing/readwritesplit/rwsplitsession.hh | 2 +- .../schemarouter/schemarouterinstance.cc | 2 +- .../schemarouter/schemaroutersession.cc | 2 +- 54 files changed, 156 insertions(+), 181 deletions(-) delete mode 100644 include/maxscale/modutil.h diff --git a/examples/roundrobinrouter.cpp b/examples/roundrobinrouter.cpp index 8f062ef80..8cbae8e80 100644 --- a/examples/roundrobinrouter.cpp +++ b/examples/roundrobinrouter.cpp @@ -44,7 +44,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/include/maxscale/customparser.hh b/include/maxscale/customparser.hh index cd998f7b3..f6adff515 100644 --- a/include/maxscale/customparser.hh +++ b/include/maxscale/customparser.hh @@ -14,7 +14,7 @@ #include #include -#include +#include #include namespace maxscale diff --git a/include/maxscale/modutil.h b/include/maxscale/modutil.h deleted file mode 100644 index 9ab6dd910..000000000 --- a/include/maxscale/modutil.h +++ /dev/null @@ -1,126 +0,0 @@ -/* - * Copyright (c) 2018 MariaDB Corporation Ab - * - * Use of this software is governed by the Business Source License included - * in the LICENSE.TXT file and at www.mariadb.com/bsl11. - * - * Change Date: 2022-01-01 - * - * On the date above, in accordance with the Business Source License, use - * of this software will be governed by version 2 or later of the General - * Public License. - */ -#pragma once - -/** - * @file modutil.h A set of useful routines for module writers - */ - -#include -#include -#include -#include -#include - -MXS_BEGIN_DECLS - -#define PTR_IS_RESULTSET(b) (b[0] == 0x01 && b[1] == 0x0 && b[2] == 0x0 && b[3] == 0x01) -#define PTR_IS_EOF(b) (b[0] == 0x05 && b[1] == 0x0 && b[2] == 0x0 && b[4] == 0xfe) -#define PTR_IS_OK(b) (b[4] == 0x00) -#define PTR_IS_ERR(b) (b[4] == 0xff) -#define PTR_IS_LOCAL_INFILE(b) (b[4] == 0xfb) -#define IS_FULL_RESPONSE(buf) (modutil_count_signal_packets(buf, 0, 0) == 2) - -extern int modutil_is_SQL(GWBUF*); -extern int modutil_is_SQL_prepare(GWBUF*); -extern int modutil_extract_SQL(GWBUF*, char**, int*); -extern int modutil_MySQL_Query(GWBUF*, char**, int*, int*); -extern char* modutil_get_SQL(GWBUF*); -extern GWBUF* modutil_replace_SQL(GWBUF*, char*); -extern char* modutil_get_query(GWBUF* buf); -extern int modutil_send_mysql_err_packet(DCB*, int, int, int, const char*, const char*); -GWBUF* modutil_get_next_MySQL_packet(GWBUF** p_readbuf); -GWBUF* modutil_get_complete_packets(GWBUF** p_readbuf); -int modutil_MySQL_query_len(GWBUF* buf, int* nbytes_missing); -void modutil_reply_parse_error(DCB* backend_dcb, char* errstr, uint32_t flags); -void modutil_reply_auth_error(DCB* backend_dcb, char* errstr, uint32_t flags); -int modutil_count_statements(GWBUF* buffer); -int modutil_count_packets(GWBUF* buffer); -GWBUF* modutil_create_query(const char* query); -GWBUF* modutil_create_mysql_err_msg(int packet_number, - int affected_rows, - int merrno, - const char* statemsg, - const char* msg); - -/** Struct used for tracking the state inside the modutil functions */ -typedef struct -{ - uint8_t state; -} modutil_state; - -/** Static initialization define for modutil_state */ -#define MODUTIL_STATE_INIT {0} - -/** - * @brief Count the number of EOF and ERR packets in the buffer. - * - * Only complete packets are inspected and the buffer is assumed to only contain - * whole packets. If partial packets are in the buffer, they are ignored. - * The caller must handle the detection of partial packets in buffers. - * - * Before the first invocation, the value pointed by the @c state parameter - * should be initialized with MODUTIL_STATE_INIT. All subsequent calls with a - * partially processed result set must be made with only unprocessed packets - * in @c reply. - * - * @param reply Buffer to use - * @param n_found Number of previous found packets - * @param more Set to true if more results exist - * @param state Internal state of the function, NULL if the function is - * only called once per result set - * - * @return Total number of EOF and ERR packets including the ones already found - */ -int modutil_count_signal_packets(GWBUF* reply, int n_found, bool* more, modutil_state* state); - -mxs_pcre2_result_t modutil_mysql_wildcard_match(const char* pattern, const char* string); - -/** - * Given a buffer containing a MySQL statement, this function will return - * a pointer to the first character that is not whitespace. In this context, - * comments are also counted as whitespace. For instance: - * - * "SELECT" => "SELECT" - * " SELECT => "SELECT" - * " / * A comment * / SELECT" => "SELECT" - * "-- comment\nSELECT" => "SELECT" - * - * @param sql Pointer to buffer containing a MySQL statement - * @param len Length of sql. - * - * @return The first non whitespace (including comments) character. If the - * entire buffer is only whitespace, the returned pointer will point - * to the character following the buffer (i.e. sql + len). - */ -char* modutil_MySQL_bypass_whitespace(char* sql, size_t len); - -/** - * @brief Write a COM_PING to a DCB and ignore the response - * - * @param dcb The backend DCB where the COM_PING is written - * @return True if command was successfully sent - */ -bool modutil_ignorable_ping(DCB* dcb); - -/** Character and token searching functions */ -char* strnchr_esc(char* ptr, char c, int len); -char* strnchr_esc_mysql(char* ptr, char c, int len); -bool is_mysql_statement_end(const char* start, int len); -bool is_mysql_sp_end(const char* start, int len); -char* modutil_get_canonical(GWBUF* querybuf); - -// TODO: Move modutil out of the core -const char* STRPACKETTYPE(int p); - -MXS_END_DECLS diff --git a/include/maxscale/modutil.hh b/include/maxscale/modutil.hh index 09916b8bc..deeb5e4f8 100644 --- a/include/maxscale/modutil.hh +++ b/include/maxscale/modutil.hh @@ -13,13 +13,114 @@ #pragma once /** - * @file modutil.hh C++ additions/alternatives for modutil.h functions + * @file modutil.hh A set of useful routines for module writers */ #include -#include - #include +#include +#include +#include + +#define PTR_IS_RESULTSET(b) (b[0] == 0x01 && b[1] == 0x0 && b[2] == 0x0 && b[3] == 0x01) +#define PTR_IS_EOF(b) (b[0] == 0x05 && b[1] == 0x0 && b[2] == 0x0 && b[4] == 0xfe) +#define PTR_IS_OK(b) (b[4] == 0x00) +#define PTR_IS_ERR(b) (b[4] == 0xff) +#define PTR_IS_LOCAL_INFILE(b) (b[4] == 0xfb) +#define IS_FULL_RESPONSE(buf) (modutil_count_signal_packets(buf, 0, 0) == 2) + +/** Static initialization define for modutil_state */ +#define MODUTIL_STATE_INIT {0} + +MXS_BEGIN_DECLS + +extern int modutil_is_SQL(GWBUF*); +extern int modutil_is_SQL_prepare(GWBUF*); +extern int modutil_extract_SQL(GWBUF*, char**, int*); +extern int modutil_MySQL_Query(GWBUF*, char**, int*, int*); +extern char* modutil_get_SQL(GWBUF*); +extern GWBUF* modutil_replace_SQL(GWBUF*, char*); +extern char* modutil_get_query(GWBUF* buf); +extern int modutil_send_mysql_err_packet(DCB*, int, int, int, const char*, const char*); +GWBUF* modutil_get_next_MySQL_packet(GWBUF** p_readbuf); +GWBUF* modutil_get_complete_packets(GWBUF** p_readbuf); +int modutil_MySQL_query_len(GWBUF* buf, int* nbytes_missing); +void modutil_reply_parse_error(DCB* backend_dcb, char* errstr, uint32_t flags); +void modutil_reply_auth_error(DCB* backend_dcb, char* errstr, uint32_t flags); +int modutil_count_statements(GWBUF* buffer); +int modutil_count_packets(GWBUF* buffer); +GWBUF* modutil_create_query(const char* query); +GWBUF* modutil_create_mysql_err_msg(int packet_number, int affected_rows, int merrno, + const char* statemsg, const char* msg); + +/** Struct used for tracking the state inside the modutil functions */ +typedef struct +{ + uint8_t state; +} modutil_state; + +/** + * @brief Count the number of EOF and ERR packets in the buffer. + * + * Only complete packets are inspected and the buffer is assumed to only contain + * whole packets. If partial packets are in the buffer, they are ignored. + * The caller must handle the detection of partial packets in buffers. + * + * Before the first invocation, the value pointed by the @c state parameter + * should be initialized with MODUTIL_STATE_INIT. All subsequent calls with a + * partially processed result set must be made with only unprocessed packets + * in @c reply. + * + * @param reply Buffer to use + * @param n_found Number of previous found packets + * @param more Set to true if more results exist + * @param state Internal state of the function, NULL if the function is + * only called once per result set + * + * @return Total number of EOF and ERR packets including the ones already found + */ +int modutil_count_signal_packets(GWBUF* reply, int n_found, bool* more, modutil_state* state); + +mxs_pcre2_result_t modutil_mysql_wildcard_match(const char* pattern, const char* string); + +/** + * Given a buffer containing a MySQL statement, this function will return + * a pointer to the first character that is not whitespace. In this context, + * comments are also counted as whitespace. For instance: + * + * "SELECT" => "SELECT" + * " SELECT => "SELECT" + * " / * A comment * / SELECT" => "SELECT" + * "-- comment\nSELECT" => "SELECT" + * + * @param sql Pointer to buffer containing a MySQL statement + * @param len Length of sql. + * + * @return The first non whitespace (including comments) character. If the + * entire buffer is only whitespace, the returned pointer will point + * to the character following the buffer (i.e. sql + len). + */ +char* modutil_MySQL_bypass_whitespace(char* sql, size_t len); + +/** + * @brief Write a COM_PING to a DCB and ignore the response + * + * @param dcb The backend DCB where the COM_PING is written + * @return True if command was successfully sent + */ +bool modutil_ignorable_ping(DCB* dcb); + +/** Character and token searching functions */ +char* strnchr_esc(char* ptr, char c, int len); +char* strnchr_esc_mysql(char* ptr, char c, int len); +bool is_mysql_statement_end(const char* start, int len); +bool is_mysql_sp_end(const char* start, int len); +char* modutil_get_canonical(GWBUF* querybuf); + +// TODO: Move modutil out of the core +const char* STRPACKETTYPE(int p); + +MXS_END_DECLS namespace maxscale { diff --git a/include/maxscale/protocol/rwbackend.hh b/include/maxscale/protocol/rwbackend.hh index 3dcbfdef8..c1529eebc 100644 --- a/include/maxscale/protocol/rwbackend.hh +++ b/include/maxscale/protocol/rwbackend.hh @@ -16,7 +16,7 @@ #include #include -#include +#include #include namespace maxscale diff --git a/query_classifier/qc_sqlite/qc_sqlite.cc b/query_classifier/qc_sqlite/qc_sqlite.cc index da812b0c6..e61ffcb8e 100644 --- a/query_classifier/qc_sqlite/qc_sqlite.cc +++ b/query_classifier/qc_sqlite/qc_sqlite.cc @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/server/core/authenticator.cc b/server/core/authenticator.cc index eba7bee90..8631f1f65 100644 --- a/server/core/authenticator.cc +++ b/server/core/authenticator.cc @@ -12,7 +12,7 @@ */ #include -#include +#include #include #include "internal/modules.hh" diff --git a/server/core/modutil.cc b/server/core/modutil.cc index 7a727ea9c..ffa583ea7 100644 --- a/server/core/modutil.cc +++ b/server/core/modutil.cc @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/server/core/queryclassifier.cc b/server/core/queryclassifier.cc index d45b9aff8..eb4aaf796 100644 --- a/server/core/queryclassifier.cc +++ b/server/core/queryclassifier.cc @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include #include diff --git a/server/core/session.cc b/server/core/session.cc index ad2438813..412849166 100644 --- a/server/core/session.cc +++ b/server/core/session.cc @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/server/core/session_command.cc b/server/core/session_command.cc index dc7f21fdf..bcf8871a6 100644 --- a/server/core/session_command.cc +++ b/server/core/session_command.cc @@ -13,7 +13,7 @@ #include -#include +#include #include namespace maxscale diff --git a/server/core/test/test_modutil.cc b/server/core/test/test_modutil.cc index 3d433ef3f..0ae6b8790 100644 --- a/server/core/test/test_modutil.cc +++ b/server/core/test/test_modutil.cc @@ -34,7 +34,7 @@ #include #include -#include +#include #include /** diff --git a/server/core/test/test_trxtracking.cc b/server/core/test/test_trxtracking.cc index 8632e1170..b3f13a5d4 100644 --- a/server/core/test/test_trxtracking.cc +++ b/server/core/test/test_trxtracking.cc @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include #include #include "../core/internal/query_classifier.hh" diff --git a/server/modules/authenticator/CDCPlainAuth/cdc_plain_auth.cc b/server/modules/authenticator/CDCPlainAuth/cdc_plain_auth.cc index 37366be18..d3d746c3b 100644 --- a/server/modules/authenticator/CDCPlainAuth/cdc_plain_auth.cc +++ b/server/modules/authenticator/CDCPlainAuth/cdc_plain_auth.cc @@ -34,7 +34,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 85a1fb4ad..03430b413 100644 --- a/server/modules/filter/cache/cache.cc +++ b/server/modules/filter/cache/cache.cc @@ -19,7 +19,7 @@ #include #include #include -#include +#include #include #include #include "storagefactory.hh" diff --git a/server/modules/filter/cache/cachefiltersession.cc b/server/modules/filter/cache/cachefiltersession.cc index 5d1aae0a2..d495a1370 100644 --- a/server/modules/filter/cache/cachefiltersession.cc +++ b/server/modules/filter/cache/cachefiltersession.cc @@ -15,7 +15,7 @@ #include "cachefiltersession.hh" #include #include -#include +#include #include #include #include "storage.hh" diff --git a/server/modules/filter/cache/rules.cc b/server/modules/filter/cache/rules.cc index b8ea8020c..b0c5e88e9 100644 --- a/server/modules/filter/cache/rules.cc +++ b/server/modules/filter/cache/rules.cc @@ -21,7 +21,7 @@ #include #include -#include +#include #include #include #include diff --git a/server/modules/filter/cache/storage/storage_inmemory/inmemorystorage.cc b/server/modules/filter/cache/storage/storage_inmemory/inmemorystorage.cc index 091bd44b0..933b95367 100644 --- a/server/modules/filter/cache/storage/storage_inmemory/inmemorystorage.cc +++ b/server/modules/filter/cache/storage/storage_inmemory/inmemorystorage.cc @@ -14,7 +14,7 @@ #define MXS_MODULE_NAME "storage_inmemory" #include "inmemorystorage.hh" #include -#include +#include #include #include "inmemorystoragest.hh" #include "inmemorystoragemt.hh" diff --git a/server/modules/filter/ccrfilter/ccrfilter.cc b/server/modules/filter/ccrfilter/ccrfilter.cc index 92fe88745..e1e0a4e8e 100644 --- a/server/modules/filter/ccrfilter/ccrfilter.cc +++ b/server/modules/filter/ccrfilter/ccrfilter.cc @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include #include diff --git a/server/modules/filter/dbfwfilter/dbfwfilter.cc b/server/modules/filter/dbfwfilter/dbfwfilter.cc index d766a0955..19b7e7178 100644 --- a/server/modules/filter/dbfwfilter/dbfwfilter.cc +++ b/server/modules/filter/dbfwfilter/dbfwfilter.cc @@ -71,7 +71,7 @@ #include #include -#include +#include #include #include #include diff --git a/server/modules/filter/dbfwfilter/rules.cc b/server/modules/filter/dbfwfilter/rules.cc index e9993de96..f9af2ae1f 100644 --- a/server/modules/filter/dbfwfilter/rules.cc +++ b/server/modules/filter/dbfwfilter/rules.cc @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include static inline bool query_is_sql(GWBUF* query) diff --git a/server/modules/filter/dbfwfilter/user.cc b/server/modules/filter/dbfwfilter/user.cc index c487e7d5e..88d39e124 100644 --- a/server/modules/filter/dbfwfilter/user.cc +++ b/server/modules/filter/dbfwfilter/user.cc @@ -14,7 +14,7 @@ #include "user.hh" #include -#include +#include #include User::User(std::string name) diff --git a/server/modules/filter/hintfilter/hintfilter.cc b/server/modules/filter/hintfilter/hintfilter.cc index bcc45f95f..19cc1624c 100644 --- a/server/modules/filter/hintfilter/hintfilter.cc +++ b/server/modules/filter/hintfilter/hintfilter.cc @@ -17,7 +17,7 @@ #include #include #include -#include +#include #include "mysqlhint.h" /** diff --git a/server/modules/filter/hintfilter/hintparser.cc b/server/modules/filter/hintfilter/hintparser.cc index e302eaa02..83ab99c8a 100644 --- a/server/modules/filter/hintfilter/hintparser.cc +++ b/server/modules/filter/hintfilter/hintparser.cc @@ -19,7 +19,7 @@ #include #include #include -#include +#include #include "mysqlhint.h" #include diff --git a/server/modules/filter/insertstream/insertstream.cc b/server/modules/filter/insertstream/insertstream.cc index 2f30e8cd9..63902fe31 100644 --- a/server/modules/filter/insertstream/insertstream.cc +++ b/server/modules/filter/insertstream/insertstream.cc @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/server/modules/filter/luafilter/luafilter.cc b/server/modules/filter/luafilter/luafilter.cc index aa05eded9..6be2520de 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 #include diff --git a/server/modules/filter/masking/maskingfiltersession.cc b/server/modules/filter/masking/maskingfiltersession.cc index a44d81a64..8538e6ca5 100644 --- a/server/modules/filter/masking/maskingfiltersession.cc +++ b/server/modules/filter/masking/maskingfiltersession.cc @@ -18,7 +18,7 @@ #include #include -#include +#include #include #include #include diff --git a/server/modules/filter/maxrows/maxrows.cc b/server/modules/filter/maxrows/maxrows.cc index ce7a02c77..8c62275b2 100644 --- a/server/modules/filter/maxrows/maxrows.cc +++ b/server/modules/filter/maxrows/maxrows.cc @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/server/modules/filter/mqfilter/mqfilter.cc b/server/modules/filter/mqfilter/mqfilter.cc index 8ac1e8430..d32d2bb8e 100644 --- a/server/modules/filter/mqfilter/mqfilter.cc +++ b/server/modules/filter/mqfilter/mqfilter.cc @@ -63,7 +63,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/server/modules/filter/namedserverfilter/namedserverfilter.cc b/server/modules/filter/namedserverfilter/namedserverfilter.cc index c781730d9..94b73e8f4 100644 --- a/server/modules/filter/namedserverfilter/namedserverfilter.cc +++ b/server/modules/filter/namedserverfilter/namedserverfilter.cc @@ -41,7 +41,7 @@ #include #include #include -#include +#include #include #include diff --git a/server/modules/filter/qlafilter/qlafilter.cc b/server/modules/filter/qlafilter/qlafilter.cc index 158c81eb6..0ca586e29 100644 --- a/server/modules/filter/qlafilter/qlafilter.cc +++ b/server/modules/filter/qlafilter/qlafilter.cc @@ -42,7 +42,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/server/modules/filter/regexfilter/regexfilter.cc b/server/modules/filter/regexfilter/regexfilter.cc index 72da788c1..d04768d2c 100644 --- a/server/modules/filter/regexfilter/regexfilter.cc +++ b/server/modules/filter/regexfilter/regexfilter.cc @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include /** diff --git a/server/modules/filter/tee/teesession.cc b/server/modules/filter/tee/teesession.cc index 347ebd6be..6cf6afae9 100644 --- a/server/modules/filter/tee/teesession.cc +++ b/server/modules/filter/tee/teesession.cc @@ -17,7 +17,7 @@ #include #include -#include +#include TeeSession::TeeSession(MXS_SESSION* session, LocalClient* client, diff --git a/server/modules/filter/test/maxscale/mock/mock.hh b/server/modules/filter/test/maxscale/mock/mock.hh index d0d3027c6..40ca88579 100644 --- a/server/modules/filter/test/maxscale/mock/mock.hh +++ b/server/modules/filter/test/maxscale/mock/mock.hh @@ -16,7 +16,7 @@ #include #include #include -#include +#include namespace maxscale diff --git a/server/modules/filter/throttlefilter/throttlesession.cc b/server/modules/filter/throttlefilter/throttlesession.cc index 14e3b57e3..fd5ac6f96 100644 --- a/server/modules/filter/throttlefilter/throttlesession.cc +++ b/server/modules/filter/throttlefilter/throttlesession.cc @@ -14,7 +14,7 @@ #define MXS_MODULE_NAME "throttlefilter" #include -#include +#include #include #include diff --git a/server/modules/filter/topfilter/topfilter.cc b/server/modules/filter/topfilter/topfilter.cc index 79f8fa66f..feed2779d 100644 --- a/server/modules/filter/topfilter/topfilter.cc +++ b/server/modules/filter/topfilter/topfilter.cc @@ -38,7 +38,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/server/modules/filter/tpmfilter/tpmfilter.cc b/server/modules/filter/tpmfilter/tpmfilter.cc index 711e81779..1a99be49c 100644 --- a/server/modules/filter/tpmfilter/tpmfilter.cc +++ b/server/modules/filter/tpmfilter/tpmfilter.cc @@ -58,7 +58,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/server/modules/monitor/mariadbmon/cluster_discovery.cc b/server/modules/monitor/mariadbmon/cluster_discovery.cc index d3861c6b3..ce5aa0f86 100644 --- a/server/modules/monitor/mariadbmon/cluster_discovery.cc +++ b/server/modules/monitor/mariadbmon/cluster_discovery.cc @@ -17,7 +17,7 @@ #include #include #include -#include +#include #include using std::string; diff --git a/server/modules/protocol/MySQL/mariadbbackend/mysql_backend.cc b/server/modules/protocol/MySQL/mariadbbackend/mysql_backend.cc index a80ef7943..bbc3cf9ba 100644 --- a/server/modules/protocol/MySQL/mariadbbackend/mysql_backend.cc +++ b/server/modules/protocol/MySQL/mariadbbackend/mysql_backend.cc @@ -17,7 +17,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/server/modules/protocol/MySQL/mariadbclient/mysql_client.cc b/server/modules/protocol/MySQL/mariadbclient/mysql_client.cc index 7ef427fe4..e5aeee884 100644 --- a/server/modules/protocol/MySQL/mariadbclient/mysql_client.cc +++ b/server/modules/protocol/MySQL/mariadbclient/mysql_client.cc @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/server/modules/protocol/MySQL/mysql_common.cc b/server/modules/protocol/MySQL/mysql_common.cc index deef95c4d..6aa68e675 100644 --- a/server/modules/protocol/MySQL/mysql_common.cc +++ b/server/modules/protocol/MySQL/mysql_common.cc @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/server/modules/protocol/MySQL/rwbackend.cc b/server/modules/protocol/MySQL/rwbackend.cc index 416716d60..1a24db716 100644 --- a/server/modules/protocol/MySQL/rwbackend.cc +++ b/server/modules/protocol/MySQL/rwbackend.cc @@ -13,7 +13,7 @@ #include -#include +#include #include #include diff --git a/server/modules/routing/cat/catsession.cc b/server/modules/routing/cat/catsession.cc index 06cc820e1..50b661a21 100644 --- a/server/modules/routing/cat/catsession.cc +++ b/server/modules/routing/cat/catsession.cc @@ -14,7 +14,7 @@ #include "catsession.hh" #include -#include +#include using namespace maxscale; diff --git a/server/modules/routing/maxinfo/maxinfo.cc b/server/modules/routing/maxinfo/maxinfo.cc index e29678963..bc2b082e0 100644 --- a/server/modules/routing/maxinfo/maxinfo.cc +++ b/server/modules/routing/maxinfo/maxinfo.cc @@ -38,7 +38,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/server/modules/routing/maxinfo/maxinfo_error.cc b/server/modules/routing/maxinfo/maxinfo_error.cc index 5fc1bcd51..cdfe69bd4 100644 --- a/server/modules/routing/maxinfo/maxinfo_error.cc +++ b/server/modules/routing/maxinfo/maxinfo_error.cc @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/server/modules/routing/maxinfo/maxinfo_exec.cc b/server/modules/routing/maxinfo/maxinfo_exec.cc index fb11ba679..1ac699cc7 100644 --- a/server/modules/routing/maxinfo/maxinfo_exec.cc +++ b/server/modules/routing/maxinfo/maxinfo_exec.cc @@ -38,7 +38,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/server/modules/routing/maxinfo/maxinfo_parse.cc b/server/modules/routing/maxinfo/maxinfo_parse.cc index c1152621e..5ed12b8dd 100644 --- a/server/modules/routing/maxinfo/maxinfo_parse.cc +++ b/server/modules/routing/maxinfo/maxinfo_parse.cc @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/server/modules/routing/readconnroute/readconnroute.cc b/server/modules/routing/readconnroute/readconnroute.cc index 9f4d8b808..df2447772 100644 --- a/server/modules/routing/readconnroute/readconnroute.cc +++ b/server/modules/routing/readconnroute/readconnroute.cc @@ -86,7 +86,7 @@ #include #include #include -#include +#include #include /* The router entry points */ diff --git a/server/modules/routing/readwritesplit/readwritesplit.cc b/server/modules/routing/readwritesplit/readwritesplit.cc index 05beed9d1..54b321047 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 fea1c98a0..e7d57b088 100644 --- a/server/modules/routing/readwritesplit/rwsplit_mysql.cc +++ b/server/modules/routing/readwritesplit/rwsplit_mysql.cc @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include diff --git a/server/modules/routing/readwritesplit/rwsplit_route_stmt.cc b/server/modules/routing/readwritesplit/rwsplit_route_stmt.cc index 259a13f56..fa125e575 100644 --- a/server/modules/routing/readwritesplit/rwsplit_route_stmt.cc +++ b/server/modules/routing/readwritesplit/rwsplit_route_stmt.cc @@ -21,7 +21,7 @@ #include #include -#include +#include #include #include #include diff --git a/server/modules/routing/readwritesplit/rwsplitsession.hh b/server/modules/routing/readwritesplit/rwsplitsession.hh index 00418122a..893e9fcf3 100644 --- a/server/modules/routing/readwritesplit/rwsplitsession.hh +++ b/server/modules/routing/readwritesplit/rwsplitsession.hh @@ -18,7 +18,7 @@ #include #include -#include +#include #include #include diff --git a/server/modules/routing/schemarouter/schemarouterinstance.cc b/server/modules/routing/schemarouter/schemarouterinstance.cc index 49d4a90a2..c984cf5cb 100644 --- a/server/modules/routing/schemarouter/schemarouterinstance.cc +++ b/server/modules/routing/schemarouter/schemarouterinstance.cc @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/server/modules/routing/schemarouter/schemaroutersession.cc b/server/modules/routing/schemarouter/schemaroutersession.cc index aa6f2332c..27228ccbe 100644 --- a/server/modules/routing/schemarouter/schemaroutersession.cc +++ b/server/modules/routing/schemarouter/schemaroutersession.cc @@ -19,7 +19,7 @@ #include #include -#include +#include #include #include #include