From 895d950da00f3b94521f22c28953e2d2e4263975 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20M=C3=A4kel=C3=A4?= Date: Thu, 28 Sep 2017 07:03:38 +0300 Subject: [PATCH] Format all source files with Astyle Formatted all source files Astyle. --- server/core/config.cc | 2 +- server/core/config_runtime.cc | 12 +- server/core/dcb.cc | 2 +- server/core/externcmd.cc | 2 +- server/core/gateway.cc | 4 +- server/core/httprequest.cc | 6 +- server/core/maxscale/trxboundaryparser.hh | 2 +- server/core/maxscale/worker.hh | 4 +- server/core/modutil.cc | 120 ++++----- server/core/query_classifier.cc | 4 +- server/core/semaphore.cc | 2 +- server/core/server.cc | 3 +- server/core/service.cc | 8 +- server/core/test/testbuffer.cc | 3 +- server/core/test/testmodutil.cc | 3 +- server/core/test/testtrxtracking.cc | 20 +- server/core/utils.cc | 3 +- .../modules/authenticator/MySQLAuth/dbusers.c | 12 +- .../PAM/PAMAuth/pam_client_session.cc | 2 +- .../PAM/PAMBackendAuth/pam_backend_session.cc | 16 +- .../filter/cache/cachefiltersession.cc | 6 +- server/modules/filter/cache/test/testrules.cc | 16 +- server/modules/filter/ccrfilter/ccrfilter.c | 6 +- .../modules/filter/dbfwfilter/dbfwfilter.cc | 4 +- .../modules/filter/masking/maskingfilter.cc | 16 +- .../filter/masking/maskingfiltersession.cc | 2 +- server/modules/filter/masking/maskingrules.cc | 14 +- server/modules/filter/maxrows/maxrows.c | 45 ++-- .../modules/filter/nullfilter/nullfilter.cc | 2 +- .../MySQL/MySQLBackend/mysql_backend.c | 12 +- .../MySQL/MySQLClient/mysql_client.cc | 76 +++--- .../MySQLClient/test/test_setsqlmodeparser.cc | 2 +- server/modules/protocol/MySQL/mysql_common.c | 6 +- server/modules/routing/avrorouter/avro_file.c | 3 +- server/modules/routing/avrorouter/avro_rbr.c | 18 +- .../modules/routing/avrorouter/avrorouter.h | 10 +- server/modules/routing/binlogrouter/blr.c | 76 +++--- .../modules/routing/binlogrouter/blr_file.c | 166 ++++++------ .../modules/routing/binlogrouter/blr_master.c | 50 ++-- .../modules/routing/binlogrouter/blr_slave.c | 251 +++++++++--------- .../routing/binlogrouter/maxbinlogcheck.c | 3 +- .../routing/binlogrouter/test/testbinlog.c | 12 +- server/modules/routing/debugcli/debugcmd.c | 2 +- 43 files changed, 525 insertions(+), 503 deletions(-) diff --git a/server/core/config.cc b/server/core/config.cc index 22268bb9a..1e0205c15 100644 --- a/server/core/config.cc +++ b/server/core/config.cc @@ -1206,7 +1206,7 @@ bool config_get_compiled_regexes(const MXS_CONFIG_PARAMETER *params, { ss_dassert(out_codes[i]); *out_codes[i] = config_get_compiled_regex(params, keys[i], options, - &ovec_size_temp); + &ovec_size_temp); if (*out_codes[i]) { if (ovec_size_temp > max_ovec_size) diff --git a/server/core/config_runtime.cc b/server/core/config_runtime.cc index 96836294f..99619b387 100644 --- a/server/core/config_runtime.cc +++ b/server/core/config_runtime.cc @@ -808,8 +808,8 @@ bool runtime_create_listener(SERVICE *service, const char *name, const char *add if (ssl_key && ssl_cert && ssl_ca && (ssl = create_ssl(name, ssl_key, ssl_cert, ssl_ca, ssl_version, ssl_depth)) == NULL) { - MXS_ERROR("SSL initialization for listener '%s' failed.", name); - runtime_error("SSL initialization for listener '%s' failed.", name); + MXS_ERROR("SSL initialization for listener '%s' failed.", name); + runtime_error("SSL initialization for listener '%s' failed.", name); } else { @@ -1189,10 +1189,10 @@ static std::string json_int_to_string(json_t* json) static inline bool have_ssl_json(json_t* params) { return mxs_json_pointer(params, CN_SSL_KEY) || - mxs_json_pointer(params, CN_SSL_CERT) || - mxs_json_pointer(params, CN_SSL_CA_CERT) || - mxs_json_pointer(params, CN_SSL_VERSION) || - mxs_json_pointer(params, CN_SSL_CERT_VERIFY_DEPTH); + mxs_json_pointer(params, CN_SSL_CERT) || + mxs_json_pointer(params, CN_SSL_CA_CERT) || + mxs_json_pointer(params, CN_SSL_VERSION) || + mxs_json_pointer(params, CN_SSL_CERT_VERIFY_DEPTH); } static bool validate_ssl_json(json_t* params) diff --git a/server/core/dcb.cc b/server/core/dcb.cc index a4ff2ac48..955df0de3 100644 --- a/server/core/dcb.cc +++ b/server/core/dcb.cc @@ -1158,7 +1158,7 @@ void dcb_final_close(DCB* dcb) if (dcb->dcb_role == DCB_ROLE_BACKEND_HANDLER && // Backend DCB dcb->state == DCB_STATE_POLLING && // Being polled dcb->persistentstart == 0 && // Not already in (> 0) or being evicted from (-1) - // the persistent pool. + // the persistent pool. dcb->server) // And has a server { /* May be a candidate for persistence, so save user name */ diff --git a/server/core/externcmd.cc b/server/core/externcmd.cc index 8ea736b71..431562fd3 100644 --- a/server/core/externcmd.cc +++ b/server/core/externcmd.cc @@ -189,7 +189,7 @@ static void log_output(const char* cmd, const std::string& str) MXS_ALERT("%s: %s", cmd, skip_prefix(str.c_str())); } else if (mxs_pcre2_simple_match("(?i)^[[:space:]]*error[[:space:]]*[:]", - str.c_str(), 0, &err) == MXS_PCRE2_MATCH) + str.c_str(), 0, &err) == MXS_PCRE2_MATCH) { MXS_ERROR("%s: %s", cmd, skip_prefix(str.c_str())); } diff --git a/server/core/gateway.cc b/server/core/gateway.cc index 6ba816046..7a3b14834 100644 --- a/server/core/gateway.cc +++ b/server/core/gateway.cc @@ -209,7 +209,7 @@ const DEBUG_ARGUMENT debug_arguments[] = }, { "redirect-output-to-file", redirect_output_to_file, - "redirect stdout and stderr to the file given as an argument" + "redirect stdout and stderr to the file given as an argument" }, {NULL, NULL, NULL} }; @@ -2733,7 +2733,7 @@ static int set_user(const char* user) } if (prctl(PR_GET_DUMPABLE) == 0) { - if (prctl(PR_SET_DUMPABLE , 1) == -1) + if (prctl(PR_SET_DUMPABLE, 1) == -1) { printf("Error: Failed to set dumpable flag on for the process '%s': %d %s\n", pwname->pw_name, errno, mxs_strerror(errno)); diff --git a/server/core/httprequest.cc b/server/core/httprequest.cc index 26408b858..005b19067 100644 --- a/server/core/httprequest.cc +++ b/server/core/httprequest.cc @@ -146,9 +146,9 @@ struct ValueFormatter } static int value_combine_cb(void *cls, - enum MHD_ValueKind kind, - const char *key, - const char *value) + enum MHD_ValueKind kind, + const char *key, + const char *value) { ValueFormatter& cnf = *(ValueFormatter*)cls; diff --git a/server/core/maxscale/trxboundaryparser.hh b/server/core/maxscale/trxboundaryparser.hh index 1e18243c5..8dc3310db 100644 --- a/server/core/maxscale/trxboundaryparser.hh +++ b/server/core/maxscale/trxboundaryparser.hh @@ -548,7 +548,7 @@ private: // Significantly faster than library version. static char toupper(char c) { - return (c >= 'a' && c <='z') ? c - ('a' - 'A') : c; + return (c >= 'a' && c <= 'z') ? c - ('a' - 'A') : c; } token_t expect_token(const char* zWord, int len, token_t token) diff --git a/server/core/maxscale/worker.hh b/server/core/maxscale/worker.hh index 35c960ee3..802733155 100644 --- a/server/core/maxscale/worker.hh +++ b/server/core/maxscale/worker.hh @@ -61,8 +61,8 @@ struct WORKER_STATISTICS }; class Worker : public MXS_WORKER - , private MessageQueue::Handler - , private MXS_POLL_DATA + , private MessageQueue::Handler + , private MXS_POLL_DATA { Worker(const Worker&); Worker& operator = (const Worker&); diff --git a/server/core/modutil.cc b/server/core/modutil.cc index 5c145e255..317f4f9ae 100644 --- a/server/core/modutil.cc +++ b/server/core/modutil.cc @@ -1334,66 +1334,66 @@ const char* STRPACKETTYPE(int p) { switch (p) { - case MXS_COM_SLEEP: - return "COM_SLEEP"; - case MXS_COM_QUIT: - return "COM_QUIT"; - case MXS_COM_INIT_DB: - return "COM_INIT_DB"; - case MXS_COM_QUERY: - return "COM_QUERY"; - case MXS_COM_FIELD_LIST: - return "COM_FIELD_LIST"; - case MXS_COM_CREATE_DB: - return "COM_CREATE_DB"; - case MXS_COM_DROP_DB: - return "COM_DROP_DB"; - case MXS_COM_REFRESH: - return "COM_REFRESH"; - case MXS_COM_SHUTDOWN: - return "COM_SHUTDOWN"; - case MXS_COM_STATISTICS: - return "COM_STATISTICS"; - case MXS_COM_PROCESS_INFO: - return "COM_PROCESS_INFO"; - case MXS_COM_CONNECT: - return "COM_CONNECT"; - case MXS_COM_PROCESS_KILL: - return "COM_PROCESS_KILL"; - case MXS_COM_DEBUG: - return "COM_DEBUG"; - case MXS_COM_PING: - return "COM_PING"; - case MXS_COM_TIME: - return "COM_TIME"; - case MXS_COM_DELAYED_INSERT: - return "COM_DELAYED_INSERT"; - case MXS_COM_CHANGE_USER: - return "COM_CHANGE_USER"; - case MXS_COM_BINLOG_DUMP: - return "COM_BINLOG_DUMP"; - case MXS_COM_TABLE_DUMP: - return "COM_TABLE_DUMP"; - case MXS_COM_CONNECT_OUT: - return "COM_CONNECT_OUT"; - case MXS_COM_REGISTER_SLAVE: - return "COM_REGISTER_SLAVE"; - case MXS_COM_STMT_PREPARE: - return "COM_STMT_PREPARE"; - case MXS_COM_STMT_EXECUTE: - return "COM_STMT_EXECUTE"; - case MXS_COM_STMT_SEND_LONG_DATA: - return "COM_STMT_SEND_LONG_DATA"; - case MXS_COM_STMT_CLOSE: - return "COM_STMT_CLOSE"; - case MXS_COM_STMT_RESET: - return "COM_STMT_RESET"; - case MXS_COM_SET_OPTION: - return "COM_SET_OPTION"; - case MXS_COM_STMT_FETCH: - return "COM_STMT_FETCH"; - case MXS_COM_DAEMON: - return "COM_DAEMON"; + case MXS_COM_SLEEP: + return "COM_SLEEP"; + case MXS_COM_QUIT: + return "COM_QUIT"; + case MXS_COM_INIT_DB: + return "COM_INIT_DB"; + case MXS_COM_QUERY: + return "COM_QUERY"; + case MXS_COM_FIELD_LIST: + return "COM_FIELD_LIST"; + case MXS_COM_CREATE_DB: + return "COM_CREATE_DB"; + case MXS_COM_DROP_DB: + return "COM_DROP_DB"; + case MXS_COM_REFRESH: + return "COM_REFRESH"; + case MXS_COM_SHUTDOWN: + return "COM_SHUTDOWN"; + case MXS_COM_STATISTICS: + return "COM_STATISTICS"; + case MXS_COM_PROCESS_INFO: + return "COM_PROCESS_INFO"; + case MXS_COM_CONNECT: + return "COM_CONNECT"; + case MXS_COM_PROCESS_KILL: + return "COM_PROCESS_KILL"; + case MXS_COM_DEBUG: + return "COM_DEBUG"; + case MXS_COM_PING: + return "COM_PING"; + case MXS_COM_TIME: + return "COM_TIME"; + case MXS_COM_DELAYED_INSERT: + return "COM_DELAYED_INSERT"; + case MXS_COM_CHANGE_USER: + return "COM_CHANGE_USER"; + case MXS_COM_BINLOG_DUMP: + return "COM_BINLOG_DUMP"; + case MXS_COM_TABLE_DUMP: + return "COM_TABLE_DUMP"; + case MXS_COM_CONNECT_OUT: + return "COM_CONNECT_OUT"; + case MXS_COM_REGISTER_SLAVE: + return "COM_REGISTER_SLAVE"; + case MXS_COM_STMT_PREPARE: + return "COM_STMT_PREPARE"; + case MXS_COM_STMT_EXECUTE: + return "COM_STMT_EXECUTE"; + case MXS_COM_STMT_SEND_LONG_DATA: + return "COM_STMT_SEND_LONG_DATA"; + case MXS_COM_STMT_CLOSE: + return "COM_STMT_CLOSE"; + case MXS_COM_STMT_RESET: + return "COM_STMT_RESET"; + case MXS_COM_SET_OPTION: + return "COM_SET_OPTION"; + case MXS_COM_STMT_FETCH: + return "COM_STMT_FETCH"; + case MXS_COM_DAEMON: + return "COM_DAEMON"; } snprintf(unknow_type, sizeof(unknow_type), format_str, p); diff --git a/server/core/query_classifier.cc b/server/core/query_classifier.cc index a6a70afbd..7c4f54f81 100644 --- a/server/core/query_classifier.cc +++ b/server/core/query_classifier.cc @@ -803,7 +803,7 @@ qc_sql_mode_t qc_get_sql_mode() qc_sql_mode_t sql_mode; - ss_debug(int32_t rv =) classifier->qc_get_sql_mode(&sql_mode); + ss_debug(int32_t rv = ) classifier->qc_get_sql_mode(&sql_mode); ss_dassert(rv == QC_RESULT_OK); return sql_mode; @@ -814,6 +814,6 @@ void qc_set_sql_mode(qc_sql_mode_t sql_mode) QC_TRACE(); ss_dassert(classifier); - ss_debug(int32_t rv =) classifier->qc_set_sql_mode(sql_mode); + ss_debug(int32_t rv = ) classifier->qc_set_sql_mode(sql_mode); ss_dassert(rv == QC_RESULT_OK); } diff --git a/server/core/semaphore.cc b/server/core/semaphore.cc index 01ef1e51f..127f73350 100644 --- a/server/core/semaphore.cc +++ b/server/core/semaphore.cc @@ -26,7 +26,7 @@ void Semaphore::get_current_timespec(time_t seconds, timespec& ts = *pTs; - ss_debug(int rc=) clock_gettime(CLOCK_REALTIME, &ts); + ss_debug(int rc = ) clock_gettime(CLOCK_REALTIME, &ts); ss_dassert(rc == 0); ts.tv_sec += seconds; diff --git a/server/core/server.cc b/server/core/server.cc index bbd4efc9e..0aac85b8c 100644 --- a/server/core/server.cc +++ b/server/core/server.cc @@ -554,7 +554,8 @@ dprintServer(DCB *dcb, const SERVER *server) dcb_printf(dcb, "\tPersistent pool size limit: %ld\n", server->persistpoolmax); dcb_printf(dcb, "\tPersistent max time (secs): %ld\n", server->persistmaxtime); dcb_printf(dcb, "\tConnections taken from pool: %lu\n", server->stats.n_from_pool); - double d = (double)server->stats.n_from_pool / (double)(server->stats.n_connections + server->stats.n_from_pool + 1); + double d = (double)server->stats.n_from_pool / (double)(server->stats.n_connections + + server->stats.n_from_pool + 1); dcb_printf(dcb, "\tPool availability: %0.2lf%%\n", d * 100.0); } if (server->server_ssl) diff --git a/server/core/service.cc b/server/core/service.cc index 264b39126..544c111d4 100644 --- a/server/core/service.cc +++ b/server/core/service.cc @@ -393,7 +393,7 @@ int serviceStartAllPorts(SERVICE* service) /** Service failed to start any ports. Try again later. */ service->stats.n_failed_starts++; char taskname[strlen(service->name) + strlen("_start_retry_") + - (int) ceil(log10(INT_MAX)) + 1]; + (int) ceil(log10(INT_MAX)) + 1]; int retry_after = MXS_MIN(service->stats.n_failed_starts * 10, service->max_retry_interval); snprintf(taskname, sizeof(taskname), "%s_start_retry_%d", service->name, service->stats.n_failed_starts); @@ -788,9 +788,9 @@ bool serviceHasListener(SERVICE* service, const char* name, const char* protocol // Listener with same name exists (strcmp(listener->name, name) == 0 || // Listener listening on the same interface and port exists - ((strcmp(listener->protocol, protocol) == 0 && listener->port == port && - ((address && listener->address && strcmp(listener->address, address) == 0) || - (address == NULL && listener->address == NULL)))))) + ((strcmp(listener->protocol, protocol) == 0 && listener->port == port && + ((address && listener->address && strcmp(listener->address, address) == 0) || + (address == NULL && listener->address == NULL)))))) { return true; } diff --git a/server/core/test/testbuffer.cc b/server/core/test/testbuffer.cc index a7fc3d8bb..af1f3d0c0 100644 --- a/server/core/test/testbuffer.cc +++ b/server/core/test/testbuffer.cc @@ -473,7 +473,8 @@ test1() ss_info_dassert(hint == buffer->hint, "Buffer should point to first and only hint"); ss_dfprintf(stderr, "\t..done\nSet a property for the buffer"); gwbuf_add_property(buffer, (char*)"name", (char*)"value"); - ss_info_dassert(0 == strcmp("value", gwbuf_get_property(buffer, (char*)"name")), "Should now have correct property"); + ss_info_dassert(0 == strcmp("value", gwbuf_get_property(buffer, (char*)"name")), + "Should now have correct property"); strcpy((char*)GWBUF_DATA(buffer), "The quick brown fox jumps over the lazy dog"); ss_dfprintf(stderr, "\t..done\nLoad some data into the buffer"); ss_info_dassert('q' == GWBUF_DATA_CHAR(buffer, 4), "Fourth character of buffer must be 'q'"); diff --git a/server/core/test/testmodutil.cc b/server/core/test/testmodutil.cc index 350a1320e..39a323b44 100644 --- a/server/core/test/testmodutil.cc +++ b/server/core/test/testmodutil.cc @@ -62,7 +62,8 @@ test1() ss_dfprintf(stderr, "\t..done\nExtract SQL from buffer different way?"); ss_info_dassert(0 == modutil_MySQL_Query(buffer, &sql, &length, &residual), "Default buffer should fail"); ss_dfprintf(stderr, "\t..done\nReplace SQL in buffer"); - ss_info_dassert(0 == modutil_replace_SQL(buffer, (char*)"select * from some_table;"), "Default buffer should fail"); + ss_info_dassert(0 == modutil_replace_SQL(buffer, (char*)"select * from some_table;"), + "Default buffer should fail"); ss_dfprintf(stderr, "\t..done\nTidy up."); gwbuf_free(buffer); ss_dfprintf(stderr, "\t..done\n"); diff --git a/server/core/test/testtrxtracking.cc b/server/core/test/testtrxtracking.cc index 9bfee512f..52953e7bd 100644 --- a/server/core/test/testtrxtracking.cc +++ b/server/core/test/testtrxtracking.cc @@ -89,21 +89,21 @@ struct test_case { "START TRANSACTION WITH CONSISTENT SNAPSHOT, READ ONLY", QUERY_TYPE_BEGIN_TRX | QUERY_TYPE_READ }, - { "SET AUTOCOMMIT=true", QUERY_TYPE_COMMIT|QUERY_TYPE_ENABLE_AUTOCOMMIT }, + { "SET AUTOCOMMIT=true", QUERY_TYPE_COMMIT | QUERY_TYPE_ENABLE_AUTOCOMMIT }, - { "SET AUTOCOMMIT=1", QUERY_TYPE_COMMIT|QUERY_TYPE_ENABLE_AUTOCOMMIT }, + { "SET AUTOCOMMIT=1", QUERY_TYPE_COMMIT | QUERY_TYPE_ENABLE_AUTOCOMMIT }, - { "SET AUTOCOMMIT=false", QUERY_TYPE_BEGIN_TRX|QUERY_TYPE_DISABLE_AUTOCOMMIT }, + { "SET AUTOCOMMIT=false", QUERY_TYPE_BEGIN_TRX | QUERY_TYPE_DISABLE_AUTOCOMMIT }, - { "SET AUTOCOMMIT=0", QUERY_TYPE_BEGIN_TRX|QUERY_TYPE_DISABLE_AUTOCOMMIT }, - { "SET @@AUTOCOMMIT=0", QUERY_TYPE_BEGIN_TRX|QUERY_TYPE_DISABLE_AUTOCOMMIT }, - { "SET GLOBAL AUTOCOMMIT=0", QUERY_TYPE_BEGIN_TRX|QUERY_TYPE_DISABLE_AUTOCOMMIT }, - { "SET SESSION AUTOCOMMIT=0", QUERY_TYPE_BEGIN_TRX|QUERY_TYPE_DISABLE_AUTOCOMMIT }, - { "SET @@SESSION . AUTOCOMMIT=0", QUERY_TYPE_BEGIN_TRX|QUERY_TYPE_DISABLE_AUTOCOMMIT }, - { "SET @@GLOBAL . AUTOCOMMIT=0", QUERY_TYPE_BEGIN_TRX|QUERY_TYPE_DISABLE_AUTOCOMMIT }, + { "SET AUTOCOMMIT=0", QUERY_TYPE_BEGIN_TRX | QUERY_TYPE_DISABLE_AUTOCOMMIT }, + { "SET @@AUTOCOMMIT=0", QUERY_TYPE_BEGIN_TRX | QUERY_TYPE_DISABLE_AUTOCOMMIT }, + { "SET GLOBAL AUTOCOMMIT=0", QUERY_TYPE_BEGIN_TRX | QUERY_TYPE_DISABLE_AUTOCOMMIT }, + { "SET SESSION AUTOCOMMIT=0", QUERY_TYPE_BEGIN_TRX | QUERY_TYPE_DISABLE_AUTOCOMMIT }, + { "SET @@SESSION . AUTOCOMMIT=0", QUERY_TYPE_BEGIN_TRX | QUERY_TYPE_DISABLE_AUTOCOMMIT }, + { "SET @@GLOBAL . AUTOCOMMIT=0", QUERY_TYPE_BEGIN_TRX | QUERY_TYPE_DISABLE_AUTOCOMMIT }, }; -const size_t N_TEST_CASES = sizeof(test_cases)/sizeof(test_cases[0]); +const size_t N_TEST_CASES = sizeof(test_cases) / sizeof(test_cases[0]); bool test(uint32_t (*getter)(GWBUF*), const char* zStmt, uint32_t expected_type_mask) diff --git a/server/core/utils.cc b/server/core/utils.cc index 11628db70..3d595874f 100644 --- a/server/core/utils.cc +++ b/server/core/utils.cc @@ -989,7 +989,8 @@ static void set_port(struct sockaddr_storage *addr, uint16_t port) } } -int open_network_socket(enum mxs_socket_type type, struct sockaddr_storage *addr, const char *host, uint16_t port) +int open_network_socket(enum mxs_socket_type type, struct sockaddr_storage *addr, const char *host, + uint16_t port) { ss_dassert(type == MXS_SOCKET_NETWORK || type == MXS_SOCKET_LISTENER); struct addrinfo *ai = NULL, hint = {}; diff --git a/server/modules/authenticator/MySQLAuth/dbusers.c b/server/modules/authenticator/MySQLAuth/dbusers.c index 76ad638bf..7f234dd35 100644 --- a/server/modules/authenticator/MySQLAuth/dbusers.c +++ b/server/modules/authenticator/MySQLAuth/dbusers.c @@ -330,7 +330,7 @@ static void merge_netmask(char *host) */ *delimiter_loc = '/'; MXS_ERROR("Unrecognized IP-bytes in host/mask-combination. " - "Merge incomplete: %s", host); + "Merge incomplete: %s", host); return; } @@ -346,7 +346,7 @@ static void merge_netmask(char *host) { *delimiter_loc = '/'; MXS_ERROR("Unequal number of IP-bytes in host/mask-combination. " - "Merge incomplete: %s", host); + "Merge incomplete: %s", host); } } @@ -463,21 +463,21 @@ static int gw_mysql_set_timeouts(MYSQL* handle) MXS_CONFIG* cnf = config_get_global_options(); if ((rc = mysql_optionsv(handle, MYSQL_OPT_READ_TIMEOUT, - (void *) &cnf->auth_read_timeout))) + (void *) &cnf->auth_read_timeout))) { MXS_ERROR("Failed to set read timeout for backend connection."); goto retblock; } if ((rc = mysql_optionsv(handle, MYSQL_OPT_CONNECT_TIMEOUT, - (void *) &cnf->auth_conn_timeout))) + (void *) &cnf->auth_conn_timeout))) { MXS_ERROR("Failed to set connect timeout for backend connection."); goto retblock; } if ((rc = mysql_optionsv(handle, MYSQL_OPT_WRITE_TIMEOUT, - (void *) &cnf->auth_write_timeout))) + (void *) &cnf->auth_write_timeout))) { MXS_ERROR("Failed to set write timeout for backend connection."); goto retblock; @@ -537,7 +537,7 @@ static bool check_server_permissions(SERVICE *service, SERVER* server, const char *template = "SELECT user, host, %s, Select_priv FROM mysql.user limit 1"; const char* query_pw = strstr(server->version_string, "5.7.") ? - MYSQL57_PASSWORD : MYSQL_PASSWORD; + MYSQL57_PASSWORD : MYSQL_PASSWORD; char query[strlen(template) + strlen(query_pw) + 1]; bool rval = true; sprintf(query, template, query_pw); diff --git a/server/modules/authenticator/PAM/PAMAuth/pam_client_session.cc b/server/modules/authenticator/PAM/PAMAuth/pam_client_session.cc index d9c7af1f8..38c713b3a 100644 --- a/server/modules/authenticator/PAM/PAMAuth/pam_client_session.cc +++ b/server/modules/authenticator/PAM/PAMAuth/pam_client_session.cc @@ -250,7 +250,7 @@ void PamClientSession::get_pam_user_services(const DCB* dcb, const MYSQL_session if (i == 0 || service_refresh_users(dcb->service) == 0) { if (sqlite3_exec(m_dbhandle, services_query.c_str(), user_services_cb, - services_out, &err) != SQLITE_OK) + services_out, &err) != SQLITE_OK) { MXS_ERROR("Failed to execute query: '%s'", err); sqlite3_free(err); diff --git a/server/modules/authenticator/PAM/PAMBackendAuth/pam_backend_session.cc b/server/modules/authenticator/PAM/PAMBackendAuth/pam_backend_session.cc index 22c52eb18..a1128b08c 100644 --- a/server/modules/authenticator/PAM/PAMBackendAuth/pam_backend_session.cc +++ b/server/modules/authenticator/PAM/PAMBackendAuth/pam_backend_session.cc @@ -16,14 +16,14 @@ namespace { - /** - * Check that the AuthSwitchRequest packet is as expected. Inverse of - * create_auth_change_packet() in pam_auth.cc. - * - * @param dcb Backend DCB - * @param buffer Buffer containing an AuthSwitchRequest packet - * @return True on success, false on error - */ +/** +* Check that the AuthSwitchRequest packet is as expected. Inverse of +* create_auth_change_packet() in pam_auth.cc. +* +* @param dcb Backend DCB +* @param buffer Buffer containing an AuthSwitchRequest packet +* @return True on success, false on error +*/ bool check_auth_switch_request(DCB *dcb, GWBUF *buffer) { /** diff --git a/server/modules/filter/cache/cachefiltersession.cc b/server/modules/filter/cache/cachefiltersession.cc index d69fd6e5e..1ec9a7deb 100644 --- a/server/modules/filter/cache/cachefiltersession.cc +++ b/server/modules/filter/cache/cachefiltersession.cc @@ -79,8 +79,8 @@ const char* NON_CACHEABLE_VARIABLES[] = "localtimestamp", }; -const size_t N_NON_CACHEABLE_FUNCTIONS = sizeof(NON_CACHEABLE_FUNCTIONS)/sizeof(NON_CACHEABLE_FUNCTIONS[0]); -const size_t N_NON_CACHEABLE_VARIABLES = sizeof(NON_CACHEABLE_VARIABLES)/sizeof(NON_CACHEABLE_VARIABLES[0]); +const size_t N_NON_CACHEABLE_FUNCTIONS = sizeof(NON_CACHEABLE_FUNCTIONS) / sizeof(NON_CACHEABLE_FUNCTIONS[0]); +const size_t N_NON_CACHEABLE_VARIABLES = sizeof(NON_CACHEABLE_VARIABLES) / sizeof(NON_CACHEABLE_VARIABLES[0]); int compare_name(const void* pLeft, const void* pRight) { @@ -146,7 +146,7 @@ bool is_select_statement(GWBUF* pStmt) char* pSql; int len; - ss_debug(int rc =) modutil_extract_SQL(pStmt, &pSql, &len); + ss_debug(int rc = ) modutil_extract_SQL(pStmt, &pSql, &len); ss_dassert(rc == 1); char* pSql_end = pSql + len; diff --git a/server/modules/filter/cache/test/testrules.cc b/server/modules/filter/cache/test/testrules.cc index 21195bad7..a0e307fc7 100644 --- a/server/modules/filter/cache/test/testrules.cc +++ b/server/modules/filter/cache/test/testrules.cc @@ -66,14 +66,14 @@ struct user_test_case const struct user_test_case user_test_cases[] = { - USER_TEST_CASE(=, bob, CACHE_OP_LIKE, bob@.*), - USER_TEST_CASE(=, 'bob', CACHE_OP_LIKE, bob@.*), - USER_TEST_CASE(=, bob@%, CACHE_OP_LIKE, bob@.*), - USER_TEST_CASE(=, 'bob'@'%.52', CACHE_OP_LIKE, bob@.*\\.52), - USER_TEST_CASE(=, bob@127.0.0.1, CACHE_OP_EQ, bob@127.0.0.1), - USER_TEST_CASE(=, b*b@127.0.0.1, CACHE_OP_EQ, b*b@127.0.0.1), - USER_TEST_CASE(=, b*b@%.0.0.1, CACHE_OP_LIKE, b\\*b@.*\\.0\\.0\\.1), - USER_TEST_CASE(=, b*b@%.0.%.1, CACHE_OP_LIKE, b\\*b@.*\\.0\\..*\\.1), + USER_TEST_CASE( =, bob, CACHE_OP_LIKE, bob@.*), + USER_TEST_CASE( =, 'bob', CACHE_OP_LIKE, bob@.*), + USER_TEST_CASE( =, bob@ %, CACHE_OP_LIKE, bob@.*), + USER_TEST_CASE( =, 'bob'@'%.52', CACHE_OP_LIKE, bob@.*\\.52), + USER_TEST_CASE( =, bob@127.0.0.1, CACHE_OP_EQ, bob@127.0.0.1), + USER_TEST_CASE( =, b*b@127.0.0.1, CACHE_OP_EQ, b*b@127.0.0.1), + USER_TEST_CASE( =, b*b@ % .0.0.1, CACHE_OP_LIKE, b\\*b@.*\\.0\\.0\\.1), + USER_TEST_CASE( =, b*b@ % .0. % .1, CACHE_OP_LIKE, b\\*b@.*\\.0\\..*\\.1), }; const size_t n_user_test_cases = sizeof(user_test_cases) / sizeof(user_test_cases[0]); diff --git a/server/modules/filter/ccrfilter/ccrfilter.c b/server/modules/filter/ccrfilter/ccrfilter.c index 5cd221689..75437d8f7 100644 --- a/server/modules/filter/ccrfilter/ccrfilter.c +++ b/server/modules/filter/ccrfilter/ccrfilter.c @@ -209,9 +209,9 @@ createInstance(const char *name, char **options, MXS_CONFIG_PARAMETER *params) const char* keys[] = {PARAM_MATCH, PARAM_IGNORE}; pcre2_code** code_arr[] = {&my_instance->re, &my_instance->nore}; - if (!config_get_compiled_regexes(params, keys, sizeof(keys)/sizeof(char*), - cflags, &my_instance->ovector_size, - code_arr)) + if (!config_get_compiled_regexes(params, keys, sizeof(keys) / sizeof(char*), + cflags, &my_instance->ovector_size, + code_arr)) { MXS_FREE(my_instance->match); MXS_FREE(my_instance->nomatch); diff --git a/server/modules/filter/dbfwfilter/dbfwfilter.cc b/server/modules/filter/dbfwfilter/dbfwfilter.cc index 8dc586074..7e0b4f41b 100644 --- a/server/modules/filter/dbfwfilter/dbfwfilter.cc +++ b/server/modules/filter/dbfwfilter/dbfwfilter.cc @@ -99,7 +99,7 @@ namespace struct DbfwThread { DbfwThread(): - rule_version(0) + rule_version(0) { } @@ -689,7 +689,7 @@ void dbfw_yyerror(void* scanner, const char* error) */ static SRule find_rule_by_name(const RuleList& rules, std::string name) { - for (RuleList::const_iterator it = rules.begin(); it != rules.end(); it++) + for (RuleList::const_iterator it = rules.begin(); it != rules.end(); it++) { if ((*it)->name() == name) { diff --git a/server/modules/filter/masking/maskingfilter.cc b/server/modules/filter/masking/maskingfilter.cc index 47d2f211c..557c43452 100644 --- a/server/modules/filter/masking/maskingfilter.cc +++ b/server/modules/filter/masking/maskingfilter.cc @@ -91,12 +91,16 @@ extern "C" MXS_MODULE* MXS_CREATE_MODULE() NULL, /* Thread finish. */ { { Config::rules_name, MXS_MODULE_PARAM_STRING, NULL, MXS_MODULE_OPT_REQUIRED }, - { Config::warn_type_mismatch_name, - MXS_MODULE_PARAM_ENUM, Config::warn_type_mismatch_default, - MXS_MODULE_OPT_NONE, Config::warn_type_mismatch_values }, - { Config::large_payload_name, - MXS_MODULE_PARAM_ENUM, Config::large_payload_default, - MXS_MODULE_OPT_NONE, Config::large_payload_values }, + { + Config::warn_type_mismatch_name, + MXS_MODULE_PARAM_ENUM, Config::warn_type_mismatch_default, + MXS_MODULE_OPT_NONE, Config::warn_type_mismatch_values + }, + { + Config::large_payload_name, + MXS_MODULE_PARAM_ENUM, Config::large_payload_default, + MXS_MODULE_OPT_NONE, Config::large_payload_values + }, { MXS_END_MODULE_PARAMS } } }; diff --git a/server/modules/filter/masking/maskingfiltersession.cc b/server/modules/filter/masking/maskingfiltersession.cc index 653bce617..2dd3503e3 100644 --- a/server/modules/filter/masking/maskingfiltersession.cc +++ b/server/modules/filter/masking/maskingfiltersession.cc @@ -131,7 +131,7 @@ void MaskingFilterSession::handle_response(GWBUF* pPacket) switch (response.type()) { case ComResponse::OK_PACKET: - // We'll end up here also in the case of a multi-result. + // We'll end up here also in the case of a multi-result. case ComResponse::LOCAL_INFILE_PACKET: // GET_MORE_CLIENT_DATA/SEND_MORE_CLIENT_DATA m_state = EXPECTING_NOTHING; break; diff --git a/server/modules/filter/masking/maskingrules.cc b/server/modules/filter/masking/maskingrules.cc index e159d3305..53a4a242f 100644 --- a/server/modules/filter/masking/maskingrules.cc +++ b/server/modules/filter/masking/maskingrules.cc @@ -601,8 +601,8 @@ static bool rule_check_database_options(json_t* pColumn, rule_type, KEY_TABLE, KEY_DATABASE); - } - return false; + } + return false; } } @@ -1189,11 +1189,11 @@ void MaskingRules::ObfuscateRule::rewrite(LEncString& s) const for (LEncString::iterator i = s.begin(); i <= s.end(); i++) { - // ASCII 32 is first printable char - unsigned char d = abs((char)(*i ^ c)) + 32; - c += d << 3; - // ASCII 126 is last printable char - *i = d <= 126 ? d : 126; + // ASCII 32 is first printable char + unsigned char d = abs((char)(*i ^ c)) + 32; + c += d << 3; + // ASCII 126 is last printable char + *i = d <= 126 ? d : 126; } } diff --git a/server/modules/filter/maxrows/maxrows.c b/server/modules/filter/maxrows/maxrows.c index 270abdfe1..15868bbc5 100644 --- a/server/modules/filter/maxrows/maxrows.c +++ b/server/modules/filter/maxrows/maxrows.c @@ -62,14 +62,14 @@ static void diagnostics(MXS_FILTER *instance, MXS_FILTER_SESSION *sdata, DCB *dcb); static json_t* diagnostics_json(const MXS_FILTER *instance, - const MXS_FILTER_SESSION *sdata); + const MXS_FILTER_SESSION *sdata); static uint64_t getCapabilities(MXS_FILTER *instance); enum maxrows_return_mode { - MAXROWS_RETURN_EMPTY = 0, - MAXROWS_RETURN_ERR, - MAXROWS_RETURN_OK + MAXROWS_RETURN_EMPTY = 0, + MAXROWS_RETURN_ERR, + MAXROWS_RETURN_OK }; static const MXS_ENUM_VALUE return_option_values[] = @@ -844,7 +844,7 @@ static int handle_rows(MAXROWS_SESSION_DATA *csdata, GWBUF* buffer, size_t extra */ if (pending_large_data && (packetlen >= MYSQL_HEADER_LEN && - packetlen < MYSQL_EOF_PACKET_LEN)) + packetlen < MYSQL_EOF_PACKET_LEN)) { // Update offset, number of rows and break offset += packetlen; @@ -1152,12 +1152,13 @@ static int send_ok_upstream(MAXROWS_SESSION_DATA *csdata) { /* Note: sequence id is always 01 (4th byte) */ const static uint8_t ok[MYSQL_OK_PACKET_MIN_LEN] = { 07, 00, 00, 01, 00, 00, - 00, 02, 00, 00, 00 }; + 00, 02, 00, 00, 00 + }; ss_dassert(csdata->res.data != NULL); GWBUF *packet = gwbuf_alloc(MYSQL_OK_PACKET_MIN_LEN); - if(!packet) + if (!packet) { /* Abort clienrt connection */ poll_fake_hangup_event(csdata->session->client_dcb); @@ -1275,21 +1276,21 @@ static int send_error_upstream(MAXROWS_SESSION_DATA *csdata) */ static int send_maxrows_reply_limit(MAXROWS_SESSION_DATA *csdata) { - switch(csdata->instance->config.m_return) + switch (csdata->instance->config.m_return) { - case MAXROWS_RETURN_EMPTY: - return send_eof_upstream(csdata); - break; - case MAXROWS_RETURN_OK: - return send_ok_upstream(csdata); - break; - case MAXROWS_RETURN_ERR: - return send_error_upstream(csdata); - break; - default: - MXS_ERROR("MaxRows config value not expected!"); - ss_dassert(!true); - return 0; - break; + case MAXROWS_RETURN_EMPTY: + return send_eof_upstream(csdata); + break; + case MAXROWS_RETURN_OK: + return send_ok_upstream(csdata); + break; + case MAXROWS_RETURN_ERR: + return send_error_upstream(csdata); + break; + default: + MXS_ERROR("MaxRows config value not expected!"); + ss_dassert(!true); + return 0; + break; } } diff --git a/server/modules/filter/nullfilter/nullfilter.cc b/server/modules/filter/nullfilter/nullfilter.cc index 696636781..14a068bba 100644 --- a/server/modules/filter/nullfilter/nullfilter.cc +++ b/server/modules/filter/nullfilter/nullfilter.cc @@ -41,7 +41,7 @@ const MXS_ENUM_VALUE capability_values[] = }; size_t RCAP_TYPE_NAME_MAXLEN = 30; // strlen(RCAP_TYPE_TRANSACTION_TRACKING) -size_t RCAP_TYPE_COUNT = sizeof(capability_values)/sizeof(capability_values[0]); +size_t RCAP_TYPE_COUNT = sizeof(capability_values) / sizeof(capability_values[0]); } diff --git a/server/modules/protocol/MySQL/MySQLBackend/mysql_backend.c b/server/modules/protocol/MySQL/MySQLBackend/mysql_backend.c index 09b1b50e1..bd13c2701 100644 --- a/server/modules/protocol/MySQL/MySQLBackend/mysql_backend.c +++ b/server/modules/protocol/MySQL/MySQLBackend/mysql_backend.c @@ -670,12 +670,12 @@ static inline bool not_ok_packet(const GWBUF* buffer) uint8_t* data = GWBUF_DATA(buffer); return data[4] != MYSQL_REPLY_OK || - // Should be more than 7 bytes of payload - gw_mysql_get_byte3(data) < MYSQL_OK_PACKET_MIN_LEN - MYSQL_HEADER_LEN || - // Should have no affected rows - data[5] != 0 || - // Should not generate an insert ID - data[6] != 0; + // Should be more than 7 bytes of payload + gw_mysql_get_byte3(data) < MYSQL_OK_PACKET_MIN_LEN - MYSQL_HEADER_LEN || + // Should have no affected rows + data[5] != 0 || + // Should not generate an insert ID + data[6] != 0; } static inline bool not_err_packet(const GWBUF* buffer) diff --git a/server/modules/protocol/MySQL/MySQLClient/mysql_client.cc b/server/modules/protocol/MySQL/MySQLClient/mysql_client.cc index 67491560e..43e7f0f6b 100644 --- a/server/modules/protocol/MySQL/MySQLClient/mysql_client.cc +++ b/server/modules/protocol/MySQL/MySQLClient/mysql_client.cc @@ -96,46 +96,46 @@ static bool parse_kill_query(char *query, uint64_t *thread_id_out, kill_type_t * extern "C" { -MXS_MODULE* MXS_CREATE_MODULE() -{ - static MXS_PROTOCOL MyObject = + MXS_MODULE* MXS_CREATE_MODULE() { - gw_read_client_event, /* Read - EPOLLIN handler */ - gw_MySQLWrite_client, /* Write - data from gateway */ - gw_write_client_event, /* WriteReady - EPOLLOUT handler */ - gw_error_client_event, /* Error - EPOLLERR handler */ - gw_client_hangup_event, /* HangUp - EPOLLHUP handler */ - gw_MySQLAccept, /* Accept */ - NULL, /* Connect */ - gw_client_close, /* Close */ - gw_MySQLListener, /* Listen */ - NULL, /* Authentication */ - NULL, /* Session */ - gw_default_auth, /* Default authenticator */ - gw_connection_limit, /* Send error connection limit */ - NULL - }; - - static MXS_MODULE info = - { - MXS_MODULE_API_PROTOCOL, - MXS_MODULE_GA, - MXS_PROTOCOL_VERSION, - "The client to MaxScale MySQL protocol implementation", - "V1.1.0", - MXS_NO_MODULE_CAPABILITIES, - &MyObject, - process_init, - process_finish, - thread_init, - thread_finish, + static MXS_PROTOCOL MyObject = { - {MXS_END_MODULE_PARAMS} - } - }; + gw_read_client_event, /* Read - EPOLLIN handler */ + gw_MySQLWrite_client, /* Write - data from gateway */ + gw_write_client_event, /* WriteReady - EPOLLOUT handler */ + gw_error_client_event, /* Error - EPOLLERR handler */ + gw_client_hangup_event, /* HangUp - EPOLLHUP handler */ + gw_MySQLAccept, /* Accept */ + NULL, /* Connect */ + gw_client_close, /* Close */ + gw_MySQLListener, /* Listen */ + NULL, /* Authentication */ + NULL, /* Session */ + gw_default_auth, /* Default authenticator */ + gw_connection_limit, /* Send error connection limit */ + NULL + }; - return &info; -} + static MXS_MODULE info = + { + MXS_MODULE_API_PROTOCOL, + MXS_MODULE_GA, + MXS_PROTOCOL_VERSION, + "The client to MaxScale MySQL protocol implementation", + "V1.1.0", + MXS_NO_MODULE_CAPABILITIES, + &MyObject, + process_init, + process_finish, + thread_init, + thread_finish, + { + {MXS_END_MODULE_PARAMS} + } + }; + + return &info; + } } /*lint +e14 */ @@ -1384,7 +1384,7 @@ static int gw_client_close(DCB *dcb) { ss_dassert(target->state == SESSION_STATE_ROUTER_READY || target->state == SESSION_STATE_STOPPING); - ss_debug(bool removed =) mxs_worker_deregister_session(target->ses_id); + ss_debug(bool removed = ) mxs_worker_deregister_session(target->ses_id); ss_dassert(removed); session_close(target); } diff --git a/server/modules/protocol/MySQL/MySQLClient/test/test_setsqlmodeparser.cc b/server/modules/protocol/MySQL/MySQLClient/test/test_setsqlmodeparser.cc index b620c04e6..62ba99612 100644 --- a/server/modules/protocol/MySQL/MySQLClient/test/test_setsqlmodeparser.cc +++ b/server/modules/protocol/MySQL/MySQLClient/test/test_setsqlmodeparser.cc @@ -172,7 +172,7 @@ struct TEST_CASE }, }; -const int N_TEST_CASES = sizeof(test_cases)/sizeof(test_cases[0]); +const int N_TEST_CASES = sizeof(test_cases) / sizeof(test_cases[0]); int test(GWBUF** ppStmt, SetSqlModeParser::sql_mode_t expected_sql_mode, diff --git a/server/modules/protocol/MySQL/mysql_common.c b/server/modules/protocol/MySQL/mysql_common.c index 4b3449c1d..5d6d190c1 100644 --- a/server/modules/protocol/MySQL/mysql_common.c +++ b/server/modules/protocol/MySQL/mysql_common.c @@ -728,7 +728,7 @@ void protocol_remove_srv_command(MySQLProtocol* p) } mxs_mysql_cmd_t protocol_get_srv_command(MySQLProtocol* p, - bool removep) + bool removep) { mxs_mysql_cmd_t cmd; @@ -1095,7 +1095,7 @@ int mxs_mysql_send_ok(DCB *dcb, int sequence, uint8_t affected_rows, const char* * @return The length of the response packet */ static int response_length(bool with_ssl, bool ssl_established, char *user, uint8_t *passwd, - char *dbname, const char *auth_module) + char *dbname, const char *auth_module) { long bytes; @@ -1379,7 +1379,7 @@ int send_mysql_native_password_response(DCB* dcb) gw_get_shared_session_auth_info(dcb, &local_session); uint8_t *curr_passwd = memcmp(local_session.client_sha1, null_client_sha1, MYSQL_SCRAMBLE_LEN) ? - local_session.client_sha1 : null_client_sha1; + local_session.client_sha1 : null_client_sha1; GWBUF* buffer = gwbuf_alloc(MYSQL_HEADER_LEN + GW_MYSQL_SCRAMBLE_SIZE); uint8_t* data = GWBUF_DATA(buffer); diff --git a/server/modules/routing/avrorouter/avro_file.c b/server/modules/routing/avrorouter/avro_file.c index 4eaced894..68307054a 100644 --- a/server/modules/routing/avrorouter/avro_file.c +++ b/server/modules/routing/avrorouter/avro_file.c @@ -99,7 +99,8 @@ void avro_close_binlog(int fd) * @param filepath Path to the created file * @param json_schema The schema of the table in JSON format */ -AVRO_TABLE* avro_table_alloc(const char* filepath, const char* json_schema, const char *codec, size_t block_size) +AVRO_TABLE* avro_table_alloc(const char* filepath, const char* json_schema, const char *codec, + size_t block_size) { AVRO_TABLE *table = MXS_CALLOC(1, sizeof(AVRO_TABLE)); if (table) diff --git a/server/modules/routing/avrorouter/avro_rbr.c b/server/modules/routing/avrorouter/avro_rbr.c index cc4ee24aa..d34820023 100644 --- a/server/modules/routing/avrorouter/avro_rbr.c +++ b/server/modules/routing/avrorouter/avro_rbr.c @@ -69,15 +69,15 @@ static const char* codec_to_string(enum mxs_avro_codec_type type) { switch (type) { - case MXS_AVRO_CODEC_NULL: - return "null"; - case MXS_AVRO_CODEC_DEFLATE: - return "deflate"; - case MXS_AVRO_CODEC_SNAPPY: - return "snappy"; - default: - ss_dassert(false); - return "null"; + case MXS_AVRO_CODEC_NULL: + return "null"; + case MXS_AVRO_CODEC_DEFLATE: + return "deflate"; + case MXS_AVRO_CODEC_SNAPPY: + return "snappy"; + default: + ss_dassert(false); + return "null"; } } diff --git a/server/modules/routing/avrorouter/avrorouter.h b/server/modules/routing/avrorouter/avrorouter.h index f99841e03..50e5e2c63 100644 --- a/server/modules/routing/avrorouter/avrorouter.h +++ b/server/modules/routing/avrorouter/avrorouter.h @@ -87,11 +87,11 @@ static char *avro_client_ouput[] = { "Undefined", "JSON", "Avro" }; static inline bool is_reserved_word(const char* word) { return strcasecmp(word, avro_domain) == 0 || - strcasecmp(word, avro_server_id) == 0 || - strcasecmp(word, avro_sequence) == 0 || - strcasecmp(word, avro_event_number) == 0 || - strcasecmp(word, avro_event_type) == 0 || - strcasecmp(word, avro_timestamp) == 0; + strcasecmp(word, avro_server_id) == 0 || + strcasecmp(word, avro_sequence) == 0 || + strcasecmp(word, avro_event_number) == 0 || + strcasecmp(word, avro_event_type) == 0 || + strcasecmp(word, avro_timestamp) == 0; } static inline void fix_reserved_word(char *tok) diff --git a/server/modules/routing/binlogrouter/blr.c b/server/modules/routing/binlogrouter/blr.c index 8bf92543a..95e8522f4 100644 --- a/server/modules/routing/binlogrouter/blr.c +++ b/server/modules/routing/binlogrouter/blr.c @@ -185,13 +185,17 @@ MXS_MODULE* MXS_CREATE_MODULE() {"transaction_safety", MXS_MODULE_PARAM_BOOL, "false"}, {"semisync", MXS_MODULE_PARAM_BOOL, "false"}, {"encrypt_binlog", MXS_MODULE_PARAM_BOOL, "false"}, - {"encryption_algorithm", MXS_MODULE_PARAM_ENUM, "aes_cbc", - MXS_MODULE_OPT_NONE, enc_algo_values}, + { + "encryption_algorithm", MXS_MODULE_PARAM_ENUM, "aes_cbc", + MXS_MODULE_OPT_NONE, enc_algo_values + }, {"encryption_key_file", MXS_MODULE_PARAM_PATH, NULL, MXS_MODULE_OPT_PATH_R_OK}, {"mariadb10_slave_gtid", MXS_MODULE_PARAM_BOOL, "false"}, {"mariadb10_master_gtid", MXS_MODULE_PARAM_BOOL, "false"}, - {"binlog_structure", MXS_MODULE_PARAM_ENUM, "flat", - MXS_MODULE_OPT_NONE, binlog_storage_values}, + { + "binlog_structure", MXS_MODULE_PARAM_ENUM, "flat", + MXS_MODULE_OPT_NONE, binlog_storage_values + }, {"shortburst", MXS_MODULE_PARAM_COUNT, DEF_SHORT_BURST}, {"longburst", MXS_MODULE_PARAM_COUNT, DEF_LONG_BURST}, {"burstsize", MXS_MODULE_PARAM_SIZE, DEF_BURST_SIZE}, @@ -788,9 +792,9 @@ createInstance(SERVICE *service, char **options) inst->storage_type == BLR_BINLOG_STORAGE_TREE) { MXS_ERROR("%s: binlog_structure 'tree' mode can be enabled only" - " with MariaDB Master GTID registration feature." - " Please enable it with option" - " 'mariadb10_master_gtid = on'", + " with MariaDB Master GTID registration feature." + " Please enable it with option" + " 'mariadb10_master_gtid = on'", service->name); free_instance(inst); return NULL; @@ -1117,9 +1121,9 @@ createInstance(SERVICE *service, char **options) " Please issue SET @@GLOBAL.GTID_SLAVE_POS =''" " and START SLAVE." " Existing binlogs might be overwritten."); - MXS_ERROR("%s: %s", - inst->service->name, - inst->m_errmsg); + MXS_ERROR("%s: %s", + inst->service->name, + inst->m_errmsg); return (MXS_ROUTER *)inst; } @@ -1239,7 +1243,7 @@ newSession(MXS_ROUTER *instance, MXS_SESSION *session) slave->encryption_ctx = NULL; slave->mariadb_gtid = NULL; slave->gtid_maps = NULL; - memset(&slave->f_info, 0 , sizeof (MARIADB_GTID_INFO)); + memset(&slave->f_info, 0, sizeof (MARIADB_GTID_INFO)); /** * Add this session to the list of active sessions. @@ -1975,10 +1979,12 @@ static json_t* diagnostics_json(const MXS_ROUTER *router) { json_t* obj = json_object(); - json_object_set_new(obj, "ssl_ca_cert", json_string(router_inst->service->dbref->server->server_ssl->ssl_ca_cert)); + json_object_set_new(obj, "ssl_ca_cert", + json_string(router_inst->service->dbref->server->server_ssl->ssl_ca_cert)); json_object_set_new(obj, "ssl_cert", json_string(router_inst->service->dbref->server->server_ssl->ssl_cert)); json_object_set_new(obj, "ssl_key", json_string(router_inst->service->dbref->server->server_ssl->ssl_key)); - json_object_set_new(obj, "ssl_version", json_string(router_inst->ssl_version ? router_inst->ssl_version : "MAX")); + json_object_set_new(obj, "ssl_version", + json_string(router_inst->ssl_version ? router_inst->ssl_version : "MAX")); json_object_set_new(rval, "master_ssl", obj); } @@ -1989,9 +1995,9 @@ static json_t* diagnostics_json(const MXS_ROUTER *router) json_t* obj = json_object(); json_object_set_new(obj, "key", json_string( - router_inst->encryption.key_management_filename)); + router_inst->encryption.key_management_filename)); json_object_set_new(obj, "algorithm", json_string( - blr_get_encryption_algorithm(router_inst->encryption.encryption_algorithm))); + blr_get_encryption_algorithm(router_inst->encryption.encryption_algorithm))); json_object_set_new(obj, "key_length", json_integer(8 * router_inst->encryption.key_len)); @@ -2050,7 +2056,7 @@ static json_t* diagnostics_json(const MXS_ROUTER *router) json_object_set_new(rval, "residual_packets", json_integer(router_inst->stats.n_residuals)); double average_packets = router_inst->stats.n_reads != 0 ? - ((double)router_inst->stats.n_binlogs / router_inst->stats.n_reads) : 0; + ((double)router_inst->stats.n_binlogs / router_inst->stats.n_reads) : 0; json_object_set_new(rval, "average_events_per_packets", json_real(average_packets)); @@ -2424,11 +2430,11 @@ errorReply(MXS_ROUTER *instance, { /* Stopped state, no reconnection */ MXS_INFO("%s: Master connection has been closed. State is '%s', " - "%snot retrying a new connection to master [%s]:%d", - router->service->name, - blrm_states[router->master_state], msg, - router->service->dbref->server->name, - router->service->dbref->server->port); + "%snot retrying a new connection to master [%s]:%d", + router->service->name, + blrm_states[router->master_state], msg, + router->service->dbref->server->name, + router->service->dbref->server->port); } if (errmsg) @@ -2853,9 +2859,9 @@ blr_handle_config_item(const char *name, const char *value, ROUTER_INSTANCE *ins if (new_val < 0) { MXS_WARNING("Found invalid 'master_heartbeat_period' value" - " for service '%s': %s, ignoring it.", - inst->service->name, - value); + " for service '%s': %s, ignoring it.", + inst->service->name, + value); } else { @@ -2872,9 +2878,9 @@ blr_handle_config_item(const char *name, const char *value, ROUTER_INSTANCE *ins if (new_val <= 0) { MXS_WARNING("Found invalid 'master_connect_retry' value" - " for service '%s': %s, ignoring it.", - inst->service->name, - value); + " for service '%s': %s, ignoring it.", + inst->service->name, + value); } else { @@ -3350,15 +3356,15 @@ static bool blr_open_gtid_maps_storage(ROUTER_INSTANCE *inst) int rc = sqlite3_exec(inst->gtid_maps, "BEGIN;" "CREATE TABLE IF NOT EXISTS gtid_maps(" - "id INTEGER PRIMARY KEY AUTOINCREMENT, " - "rep_domain INT, " - "server_id INT, " - "sequence BIGINT, " - "binlog_file VARCHAR(255), " - "start_pos BIGINT, " - "end_pos BIGINT);" + "id INTEGER PRIMARY KEY AUTOINCREMENT, " + "rep_domain INT, " + "server_id INT, " + "sequence BIGINT, " + "binlog_file VARCHAR(255), " + "start_pos BIGINT, " + "end_pos BIGINT);" "CREATE UNIQUE INDEX IF NOT EXISTS gtid_index " - "ON gtid_maps(rep_domain, server_id, sequence, binlog_file);" + "ON gtid_maps(rep_domain, server_id, sequence, binlog_file);" "COMMIT;", NULL, NULL, &errmsg); if (rc != SQLITE_OK) diff --git a/server/modules/routing/binlogrouter/blr_file.c b/server/modules/routing/binlogrouter/blr_file.c index 0da09b31b..012da0f88 100644 --- a/server/modules/routing/binlogrouter/blr_file.c +++ b/server/modules/routing/binlogrouter/blr_file.c @@ -158,10 +158,10 @@ static uint8_t *blr_create_ignorable_event(uint32_t event_size, uint32_t event_pos, bool do_checksum); int blr_write_special_event(ROUTER_INSTANCE *router, - uint32_t file_offset, - uint32_t hole_size, - REP_HEADER *hdr, - int type); + uint32_t file_offset, + uint32_t hole_size, + REP_HEADER *hdr, + int type); static uint8_t *blr_create_start_encryption_event(ROUTER_INSTANCE *router, uint32_t event_pos, bool do_checksum); @@ -481,13 +481,13 @@ blr_file_create(ROUTER_INSTANCE *router, char *orig_file) strcpy(path, router->binlogdir); strcat(path, "/"); - /** - * Create file using domain and server_id prefix - */ - if (router->mariadb10_compat && - router->mariadb10_master_gtid && - router->storage_type == BLR_BINLOG_STORAGE_TREE) - { + /** + * Create file using domain and server_id prefix + */ + if (router->mariadb10_compat && + router->mariadb10_master_gtid && + router->storage_type == BLR_BINLOG_STORAGE_TREE) + { char prefix[BINLOG_FILE_EXTRA_INFO]; // Add prefix sprintf(prefix, @@ -1585,17 +1585,17 @@ blr_file_next_exists(ROUTER_INSTANCE *router, char bigbuf[PATH_MAX + 1]; char select_query[GTID_SQL_BUFFER_SIZE]; const char select_tpl[] = "SELECT " - "(rep_domain || '/' || server_id || '/' || binlog_file) AS file, " - "rep_domain, " - "server_id, " - "binlog_file " + "(rep_domain || '/' || server_id || '/' || binlog_file) AS file, " + "rep_domain, " + "server_id, " + "binlog_file " "FROM gtid_maps " - "WHERE id = " - "(SELECT MAX(id) " - "FROM gtid_maps " - "WHERE (binlog_file='%s' AND " - "rep_domain = %" PRIu32 " AND " - "server_id = %" PRIu32 ")) + 1;"; + "WHERE id = " + "(SELECT MAX(id) " + "FROM gtid_maps " + "WHERE (binlog_file='%s' AND " + "rep_domain = %" PRIu32 " AND " + "server_id = %" PRIu32 ")) + 1;"; MARIADB_GTID_INFO result = {}; MARIADB_GTID_ELEMS gtid_elms = {}; @@ -2603,8 +2603,8 @@ blr_read_events_all_events(ROUTER_INSTANCE *router, n_sequence); MXS_DEBUG("GTID List Event has %lu GTIDs, first one is %s", - n_gtids, - mariadb_gtid); + n_gtids, + mariadb_gtid); if (router->storage_type == BLR_BINLOG_STORAGE_TREE) { @@ -3945,27 +3945,27 @@ bool blr_save_mariadb_gtid(ROUTER_INSTANCE *inst) { int sql_ret; static const char insert_tpl[] = "INSERT OR FAIL INTO gtid_maps(" - "rep_domain, " - "server_id, " - "sequence, " - "binlog_file, " - "start_pos, " - "end_pos) " + "rep_domain, " + "server_id, " + "sequence, " + "binlog_file, " + "start_pos, " + "end_pos) " "VALUES ( " - "%" PRIu32 ", " - "%" PRIu32 ", " - "%" PRIu64 ", " - "\"%s\", " - "%" PRIu64 ", " - "%" PRIu64 ");"; + "%" PRIu32 ", " + "%" PRIu32 ", " + "%" PRIu64 ", " + "\"%s\", " + "%" PRIu64 ", " + "%" PRIu64 ");"; static const char update_tpl[] = "UPDATE gtid_maps SET " - "start_pos = %" PRIu64 ", " - "end_pos = %" PRIu64 " " + "start_pos = %" PRIu64 ", " + "end_pos = %" PRIu64 " " "WHERE rep_domain = %" PRIu32 " AND " - "server_id = %" PRIu32 " AND " - "sequence = %" PRIu64 " AND " - "binlog_file = \"%s\";"; + "server_id = %" PRIu32 " AND " + "sequence = %" PRIu64 " AND " + "binlog_file = \"%s\";"; char *errmsg; char sql_stmt[GTID_SQL_BUFFER_SIZE]; MARIADB_GTID_INFO gtid_info; @@ -4132,19 +4132,19 @@ bool blr_fetch_mariadb_gtid(ROUTER_SLAVE *slave, * with old content. */ static const char select_tpl[] = "SELECT " - "(rep_domain ||" - " '-' || server_id ||" - " '-' || sequence) AS gtid, " - "binlog_file, " - "start_pos, " - "end_pos, " - "rep_domain, " - "server_id, " - "sequence " + "(rep_domain ||" + " '-' || server_id ||" + " '-' || sequence) AS gtid, " + "binlog_file, " + "start_pos, " + "end_pos, " + "rep_domain, " + "server_id, " + "sequence " "FROM gtid_maps " - "WHERE (rep_domain = %" PRIu32 " AND " - "server_id = %" PRIu32 " AND " - "sequence = %" PRIu64 ") " + "WHERE (rep_domain = %" PRIu32 " AND " + "server_id = %" PRIu32 " AND " + "sequence = %" PRIu64 ") " "ORDER BY id DESC LIMIT 1;"; ss_dassert(gtid != NULL); @@ -4295,20 +4295,20 @@ bool blr_load_last_mariadb_gtid(ROUTER_INSTANCE *router, char *errmsg = NULL; MARIADB_GTID_ELEMS gtid_elms = {}; static const char last_gtid[] = "SELECT " - "(rep_domain ||" - " '-' || server_id ||" - " '-' || sequence) AS gtid, " - "binlog_file, " - "start_pos, " - "end_pos, " - "rep_domain, " - "server_id, " - "sequence " - "FROM gtid_maps " - "WHERE id = " - "(SELECT MAX(id) " - "FROM gtid_maps " - "WHERE start_pos > 4);"; + "(rep_domain ||" + " '-' || server_id ||" + " '-' || sequence) AS gtid, " + "binlog_file, " + "start_pos, " + "end_pos, " + "rep_domain, " + "server_id, " + "sequence " + "FROM gtid_maps " + "WHERE id = " + "(SELECT MAX(id) " + "FROM gtid_maps " + "WHERE start_pos > 4);"; /* Find the last GTID */ if (sqlite3_exec(router->gtid_maps, @@ -4376,18 +4376,18 @@ bool blr_get_last_file(ROUTER_INSTANCE *router, char *errmsg = NULL; MARIADB_GTID_ELEMS gtid_elms = {}; static const char last_gtid[] = "SELECT " - "(rep_domain ||" - " '-' || server_id ||" - " '-' || sequence) AS gtid, " - "binlog_file, " - "start_pos, " - "end_pos, " - "rep_domain, " - "server_id, " - "sequence " - "FROM gtid_maps " - "WHERE id = " - "(SELECT MAX(id) FROM gtid_maps);"; + "(rep_domain ||" + " '-' || server_id ||" + " '-' || sequence) AS gtid, " + "binlog_file, " + "start_pos, " + "end_pos, " + "rep_domain, " + "server_id, " + "sequence " + "FROM gtid_maps " + "WHERE id = " + "(SELECT MAX(id) FROM gtid_maps);"; /* Find the the last file */ if (sqlite3_exec(router->gtid_maps, @@ -4428,10 +4428,10 @@ bool blr_compare_binlogs(ROUTER_INSTANCE *router, } else { - // domain_id, server_id and strcmp() - return ((router->mariadb10_gtid_domain == info->domain_id) && - (router->orig_masterid == info->server_id) && - strcmp(r_file, s_file) == 0); + // domain_id, server_id and strcmp() + return ((router->mariadb10_gtid_domain == info->domain_id) && + (router->orig_masterid == info->server_id) && + strcmp(r_file, s_file) == 0); } } @@ -4489,7 +4489,7 @@ bool blr_binlog_file_exists(ROUTER_INSTANCE *router, "%" PRIu32 "/%" PRIu32 "/", router->mariadb10_gtid_domain, router->orig_masterid); - strcat(path, prefix); + strcat(path, prefix); } // Set final file name full path diff --git a/server/modules/routing/binlogrouter/blr_master.c b/server/modules/routing/binlogrouter/blr_master.c index e922ef894..1fd4fe304 100644 --- a/server/modules/routing/binlogrouter/blr_master.c +++ b/server/modules/routing/binlogrouter/blr_master.c @@ -172,8 +172,8 @@ static void blr_start_master(void* data) else { MXS_NOTICE("%s: Master Connect: binlog current state is [%s]\n", - router->service->name, - blrm_states[router->master_state]); + router->service->name, + blrm_states[router->master_state]); } /* Return only if state is not BLRM_CONNECTING */ @@ -3187,10 +3187,10 @@ static void blr_start_master_registration(ROUTER_INSTANCE *router, GWBUF *buf) */ if (router->master_state == BLRM_CHECK_SEMISYNC) { - if (blr_register_setsemisync(router, buf)) - { - break; - } + if (blr_register_setsemisync(router, buf)) + { + break; + } } case BLRM_REQUEST_SEMISYNC: /** @@ -3284,9 +3284,9 @@ static void blr_register_mariadb_gtid_request(ROUTER_INSTANCE *router, format_gtid_val, router->last_mariadb_gtid); - MXS_INFO("%s: Requesting GTID (%s) from master server.", - router->service->name, - router->last_mariadb_gtid); + MXS_INFO("%s: Requesting GTID (%s) from master server.", + router->service->name, + router->last_mariadb_gtid); // Send the request blr_register_send_command(router, set_gtid, @@ -3412,27 +3412,27 @@ static void blr_handle_fake_gtid_list(ROUTER_INSTANCE *router, */ if (hdr->next_pos && (hdr->next_pos > binlog_file_eof)) { - uint64_t hole_size = hdr->next_pos - binlog_file_eof; + uint64_t hole_size = hdr->next_pos - binlog_file_eof; - MXS_INFO("Detected hole while processing" - " a Fake GTID_LIST Event: hole size will be %" - PRIu64 " bytes", - hole_size); + MXS_INFO("Detected hole while processing" + " a Fake GTID_LIST Event: hole size will be %" + PRIu64 " bytes", + hole_size); - /* Set the offet for the write routine */ - spinlock_acquire(&router->binlog_lock); + /* Set the offet for the write routine */ + spinlock_acquire(&router->binlog_lock); - router->last_written = binlog_file_eof; + router->last_written = binlog_file_eof; - spinlock_release(&router->binlog_lock); + spinlock_release(&router->binlog_lock); - // Write One Hole - // TODO: write small holes - blr_write_special_event(router, - binlog_file_eof, - hole_size, - hdr, - BLRM_IGNORABLE); + // Write One Hole + // TODO: write small holes + blr_write_special_event(router, + binlog_file_eof, + hole_size, + hdr, + BLRM_IGNORABLE); } else { diff --git a/server/modules/routing/binlogrouter/blr_slave.c b/server/modules/routing/binlogrouter/blr_slave.c index 32927f0e2..9f6d40232 100644 --- a/server/modules/routing/binlogrouter/blr_slave.c +++ b/server/modules/routing/binlogrouter/blr_slave.c @@ -100,13 +100,13 @@ */ typedef struct { - int seq_no; /* Output sequence in result set */ - char *last_file; /* Last binlog file found in GTID repo */ - const char *binlogdir; /* Binlog files cache dir */ - DCB *client; /* Connected client DCB */ - bool use_tree; /* Binlog structure type */ - size_t n_files; /* How many files */ - uint64_t rowid; /* ROWID of router current file*/ + int seq_no; /* Output sequence in result set */ + char *last_file; /* Last binlog file found in GTID repo */ + const char *binlogdir; /* Binlog files cache dir */ + DCB *client; /* Connected client DCB */ + bool use_tree; /* Binlog structure type */ + size_t n_files; /* How many files */ + uint64_t rowid; /* ROWID of router current file*/ } BINARY_LOG_DATA_RESULT; extern void poll_fake_write_event(DCB *dcb); @@ -486,7 +486,8 @@ blr_skip_leading_sql_comments(const char *sql_query) { const char *p = sql_query; - while (*p) { + while (*p) + { if (*p == '/' && p[1] == '*') { ++p; // skip '/' @@ -709,15 +710,16 @@ blr_slave_query(ROUTER_INSTANCE *router, ROUTER_SLAVE *slave, GWBUF *queue) } } else - { /* Handle ADMIN commands */ - if (blr_handle_admin_stmt(router, - slave, - word, - brkb)) - { - MXS_FREE(query_text); - return 1; - } + { + /* Handle ADMIN commands */ + if (blr_handle_admin_stmt(router, + slave, + word, + brkb)) + { + MXS_FREE(query_text); + return 1; + } } /* - 3 - Handle unsuppored statements from client */ @@ -829,7 +831,8 @@ static uint8_t timestamp_def[] = 0x00, 0x00, 0x03, 0xfe, 0x00, 0x00, 0x02, 0x00 }; static uint8_t timestamp_eof[] = { 0x05, 0x00, 0x00, 0x05, - 0xfe, 0x00, 0x00, 0x02, 0x00 }; + 0xfe, 0x00, 0x00, 0x02, 0x00 + }; /** * Send a response to a "SELECT UNIX_TIMESTAMP()" request. @@ -1206,8 +1209,8 @@ blr_slave_send_slave_status(ROUTER_INSTANCE *router, /* Get the right GTID columns array */ const char **gtid_status_columns = router->mariadb10_gtid ? - mariadb10_gtid_status_columns : - mysql_gtid_status_columns; + mariadb10_gtid_status_columns : + mysql_gtid_status_columns; /* Increment ncols with the right GTID columns */ while (gtid_status_columns[gtid_cols++]) { @@ -1664,7 +1667,7 @@ blr_slave_send_slave_status(ROUTER_INSTANCE *router, * Send the response to the SQL command "SHOW SLAVE HOSTS" * * @param router The binlog router instance - * @param slave The connected slave server + * @param slave The connected slave server * @return Non-zero if data was sent */ static int @@ -1898,10 +1901,10 @@ blr_slave_binlog_dump(ROUTER_INSTANCE *router, ROUTER_SLAVE *slave, GWBUF *queue binlognamelen > 0, requested_pos)) { - // ERROR - slave->state = BLRS_ERRORED; - dcb_close(slave->dcb); - return 1; + // ERROR + slave->state = BLRS_ERRORED; + dcb_close(slave->dcb); + return 1; } } else @@ -2602,7 +2605,7 @@ blr_slave_catchup(ROUTER_INSTANCE *router, ROUTER_SLAVE *slave, bool large) * 1) Same name and pos as current router file: aka Up To Date */ if (slave->binlog_pos == router->binlog_position && - blr_is_current_binlog(router, slave)) + blr_is_current_binlog(router, slave)) { spinlock_acquire(&router->binlog_lock); spinlock_acquire(&slave->catch_lock); @@ -3241,7 +3244,7 @@ blr_slave_send_disconnected_server(ROUTER_INSTANCE *router, * and close the connection to that server * * @param router The binlog router instance - * @param slave The connected slave server + * @param slave The connected slave server * @param server_id The slave server_id to disconnect * @return Non-zero if data was sent to the client */ @@ -3262,7 +3265,7 @@ blr_slave_disconnect_server(ROUTER_INSTANCE *router, { /* don't examine slaves with state = 0 */ if ((sptr->state == BLRS_REGISTERED || - sptr->state == BLRS_DUMPING) && + sptr->state == BLRS_DUMPING) && sptr->serverid == server_id) { /* server_id found */ @@ -3752,7 +3755,7 @@ blr_start_slave(ROUTER_INSTANCE* router, ROUTER_SLAVE* slave) /* A new binlog file has been created and opened * by CHANGE MASTER TO: use it */ - blr_file_append(router, router->binlog_name); + blr_file_append(router, router->binlog_name); } } } @@ -3810,9 +3813,9 @@ blr_start_slave(ROUTER_INSTANCE* router, ROUTER_SLAVE* slave) */ static void blr_slave_send_error_packet(ROUTER_SLAVE *slave, - char *msg, - unsigned int err_num, - char *status) + char *msg, + unsigned int err_num, + char *status) { GWBUF *pkt; unsigned char *data; @@ -3948,7 +3951,7 @@ int blr_handle_change_master(ROUTER_INSTANCE* router, * router->mariadb10_master_gtid is not set */ if (!router->mariadb10_master_gtid && - change_master.use_mariadb10_gtid) + change_master.use_mariadb10_gtid) { snprintf(error, BINLOG_ERROR_MSG_LEN, @@ -3978,11 +3981,11 @@ int blr_handle_change_master(ROUTER_INSTANCE* router, h_val > BLR_HEARTBEAT_MAX_INTERVAL) { snprintf(error, - BINLOG_ERROR_MSG_LEN, - "The requested value for the heartbeat period is " - "either negative or exceeds the maximum allowed " - "(%d seconds).", - BLR_HEARTBEAT_MAX_INTERVAL); + BINLOG_ERROR_MSG_LEN, + "The requested value for the heartbeat period is " + "either negative or exceeds the maximum allowed " + "(%d seconds).", + BLR_HEARTBEAT_MAX_INTERVAL); blr_abort_change_master(router, current_master, @@ -4053,7 +4056,7 @@ int blr_handle_change_master(ROUTER_INSTANCE* router, !change_master.ssl_key)) { if (change_master.ssl_enabled && - atoi(change_master.ssl_enabled)) + atoi(change_master.ssl_enabled)) { snprintf(error, BINLOG_ERROR_MSG_LEN, @@ -4083,8 +4086,8 @@ int blr_handle_change_master(ROUTER_INSTANCE* router, * or empty if router->mariadb10_master_gtid is set. */ if (!blr_binlog_change_check(router, - change_master, - error) || + change_master, + error) || !blr_change_binlog_name(router, change_master.binlog_file, &master_logfile, @@ -6299,10 +6302,10 @@ static bool blr_handle_simple_select_stmt(ROUTER_INSTANCE *router, else if (strcasecmp(word, "@@version_comment") == 0) { if (!router->saved_master.selectvercom) - /** - * This allows mysql client to get in when - * @@version_comment is not available - */ + /** + * This allows mysql client to get in when + * @@version_comment is not available + */ { blr_slave_send_ok(router, slave); return true; @@ -6310,8 +6313,8 @@ static bool blr_handle_simple_select_stmt(ROUTER_INSTANCE *router, else { blr_slave_replay(router, - slave, - router->saved_master.selectvercom); + slave, + router->saved_master.selectvercom); return true; } } @@ -6494,10 +6497,10 @@ static GWBUF *blr_build_fake_rotate_event(ROUTER_SLAVE *slave, return NULL; } - /* Add 1 byte to paylod for status indicator */ + /* Add 1 byte to paylod for status indicator */ hdr.payload_len = len + 1; - /* Add sequence and increment it */ + /* Add sequence and increment it */ hdr.seqno = slave->seqno++; /* Set status indicator byte to OK */ @@ -6768,7 +6771,7 @@ static bool blr_slave_gtid_request(ROUTER_INSTANCE *router, blr_get_file_fullpath(slave->binlogfile, router->binlogdir, file_path, - t_prefix[0] ? t_prefix: NULL); + t_prefix[0] ? t_prefix : NULL); // File size is >=4 read: set pos. if (blr_slave_get_file_size(file_path) >= 4) { @@ -6947,7 +6950,7 @@ static bool blr_handle_maxwell_stmt(ROUTER_INSTANCE *router, static const char maxwell_lower_case_tables_query[] = "select @@lower_case_table_names"; if (strcmp(blr_skip_leading_sql_comments(maxwell_stmt), - MYSQL_CONNECTOR_SERVER_VARS_QUERY) == 0) + MYSQL_CONNECTOR_SERVER_VARS_QUERY) == 0) { int rc = blr_slave_replay(router, slave, @@ -7075,8 +7078,8 @@ static bool blr_handle_show_stmt(ROUTER_INSTANCE *router, errmsg, 1198, NULL); - } - return true; + } + return true; } else if (strcasecmp(word, "GLOBAL") == 0) { @@ -7480,11 +7483,11 @@ static bool blr_handle_set_stmt(ROUTER_INSTANCE *router, * Set the GTID string, it could be an empty * in case of a fresh new setup. */ - MXS_FREE(slave->mariadb_gtid); - slave->mariadb_gtid = MXS_STRDUP_A(heading); + MXS_FREE(slave->mariadb_gtid); + slave->mariadb_gtid = MXS_STRDUP_A(heading); - blr_slave_send_ok(router, slave); - return true; + blr_slave_send_ok(router, slave); + return true; } else { @@ -7894,7 +7897,7 @@ static bool blr_handle_admin_stmt(ROUTER_INSTANCE *router, if (!router->mariadb10_master_gtid && (strlen(router->prevbinlog) && - strcmp(router->prevbinlog, router->binlog_name) != 0)) + strcmp(router->prevbinlog, router->binlog_name) != 0)) { if (blr_file_new_binlog(router, router->binlog_name)) { @@ -7985,7 +7988,7 @@ static void blr_slave_skip_empty_files(ROUTER_INSTANCE *router, blr_get_file_fullpath(binlog_file, router->binlogdir, file_path, - t_prefix[0] ? t_prefix: NULL); + t_prefix[0] ? t_prefix : NULL); /** * Get the next file in sequence or next by GTID maps @@ -8012,7 +8015,7 @@ static void blr_slave_skip_empty_files(ROUTER_INSTANCE *router, blr_get_file_fullpath(binlog_file, router->binlogdir, file_path, - t_prefix[0] ? t_prefix: NULL); + t_prefix[0] ? t_prefix : NULL); skipped_files = true; } @@ -8069,20 +8072,20 @@ blr_show_binary_logs(ROUTER_INSTANCE *router, char current_file[BINLOG_FNAMELEN]; uint64_t current_pos = 0; static const char select_query[] = "SELECT binlog_file, " - "MAX(end_pos) AS size, " - "rep_domain, " - "server_id " + "MAX(end_pos) AS size, " + "rep_domain, " + "server_id " "FROM gtid_maps " - "GROUP BY binlog_file " + "GROUP BY binlog_file " "ORDER BY id ASC;"; static const char select_query_full[] = "SELECT binlog_file, " - "MAX(end_pos) AS size, " - "rep_domain, " - "server_id " + "MAX(end_pos) AS size, " + "rep_domain, " + "server_id " "FROM gtid_maps " - "GROUP BY rep_domain, " - "server_id, " - "binlog_file " + "GROUP BY rep_domain, " + "server_id, " + "binlog_file " "ORDER BY id ASC;"; int seqno; char *errmsg = NULL; @@ -8186,8 +8189,8 @@ blr_show_binary_logs(ROUTER_INSTANCE *router, char t_prefix[BINLOG_FILE_EXTRA_INFO]; sprintf(t_prefix, "%" PRIu32 "/%" PRIu32 "/", - router->mariadb10_gtid_domain, - router->orig_masterid); + router->mariadb10_gtid_domain, + router->orig_masterid); // Add prefix before filename sprintf(last_filename, @@ -8287,8 +8290,8 @@ static int binary_logs_select_cb(void *data, GWBUF *pkt; char file_path[PATH_MAX + 1]; char filename[1 + - strlen(values[0]) + - BINLOG_FILE_EXTRA_INFO]; + strlen(values[0]) + + BINLOG_FILE_EXTRA_INFO]; char t_prefix[BINLOG_FILE_EXTRA_INFO] = ""; sprintf(t_prefix, @@ -8412,7 +8415,7 @@ static int blr_slave_send_id_ro(ROUTER_INSTANCE *router, "0", // o = OFF seqno++)) != NULL) { - /* Write packet to client */ + /* Write packet to client */ MXS_SESSION_ROUTE_REPLY(slave->dcb->session, pkt); } @@ -8438,15 +8441,15 @@ static bool blr_handle_complex_select(ROUTER_INSTANCE *router, const char *coln) { /* Strip leading spaces */ - while(isspace(*coln)) + while (isspace(*coln)) { coln++; } if ((strcasecmp(col1, "@@server_id") == 0 || - strcasecmp(col1, "@@global.server_id") == 0) && - (strcasecmp(coln, "@@read_only") == 0 || - strcasecmp(coln, "@@global.read_only") == 0)) + strcasecmp(col1, "@@global.server_id") == 0) && + (strcasecmp(coln, "@@read_only") == 0 || + strcasecmp(coln, "@@global.read_only") == 0)) { blr_slave_send_id_ro(router, slave); return true; @@ -8567,7 +8570,7 @@ static const char *blr_purge_getfile(char *purge_command) return NULL; } else - // Check for TO 'file' + // Check for TO 'file' { if (strcasecmp(word, "TO") != 0) { @@ -8620,24 +8623,24 @@ blr_purge_binary_logs(ROUTER_INSTANCE *router, size_t n_delete = 0; // Select first ROWID of user specifed file static const char find_file_tpl[] = "SELECT MIN(id) AS min_id, " - "(rep_domain || '/' || " - "server_id || '/' || " - "binlog_file) AS file " + "(rep_domain || '/' || " + "server_id || '/' || " + "binlog_file) AS file " "FROM gtid_maps " - "WHERE binlog_file = '%s' " + "WHERE binlog_file = '%s' " "GROUP BY binlog_file " "ORDER BY id ASC;"; // SELECT files with ROWID < given one and DELETE static const char delete_list_tpl[] = "SELECT binlog_file, " - "(rep_domain || '/' || " - "server_id || '/' || " - "binlog_file) AS file " + "(rep_domain || '/' || " + "server_id || '/' || " + "binlog_file) AS file " "FROM gtid_maps " - "WHERE id < %" PRIu64 " " + "WHERE id < %" PRIu64 " " "GROUP BY file " "ORDER BY id ASC; " "DELETE FROM gtid_maps " - "WHERE id < %" PRIu64 ";"; + "WHERE id < %" PRIu64 ";"; static char sql_stmt[GTID_SQL_BUFFER_SIZE]; BINARY_LOG_DATA_RESULT result; static const char *selected_file; @@ -8696,10 +8699,10 @@ blr_purge_binary_logs(ROUTER_INSTANCE *router, /* Purge all files with ROWID < result.rowid */ if (sqlite3_exec(router->gtid_maps, - sql_stmt, - binary_logs_purge_cb, - &result, - &errmsg) != SQLITE_OK) + sql_stmt, + binary_logs_purge_cb, + &result, + &errmsg) != SQLITE_OK) { MXS_ERROR("Failed to select list of files to purge" "from GTID maps DB: %s, select [%s]", @@ -8830,13 +8833,13 @@ static bool blr_check_connecting_slave(const ROUTER_INSTANCE *router, int err_code = BINLOG_FATAL_ERROR_READING; char *msg_detail = ""; - switch(check) + switch (check) { case BLR_SLAVE_CONNECTING: // (1) if (router->master_state == BLRM_UNCONFIGURED) { err_msg = "Binlog router is not yet configured" - " for replication."; + " for replication."; rv = false; } break; @@ -8979,10 +8982,10 @@ static bool blr_binlog_change_check(const ROUTER_INSTANCE *router, } } else - /** - * If binlog file is set in CHANGE MASTER TO - * and MASTER_USE_GTID option is on, then return an error. - */ + /** + * If binlog file is set in CHANGE MASTER TO + * and MASTER_USE_GTID option is on, then return an error. + */ { /** * Check first MASTER_USE_GTID option: @@ -9048,16 +9051,16 @@ static bool blr_change_binlog_name(ROUTER_INSTANCE *router, * - current router file * - empty if router->mariadb10_master_gtid is set. */ - *new_logfile = blr_set_master_logfile(router, - binlog_file, - error); - if (*new_logfile == NULL) - { - if (!router->mariadb10_master_gtid || - strlen(binlog_file) > 1) - { - /* Binlog name can not be changed */ - ret = false; + *new_logfile = blr_set_master_logfile(router, + binlog_file, + error); + if (*new_logfile == NULL) + { + if (!router->mariadb10_master_gtid || + strlen(binlog_file) > 1) + { + /* Binlog name can not be changed */ + ret = false; } else { @@ -9065,9 +9068,9 @@ static bool blr_change_binlog_name(ROUTER_INSTANCE *router, // Blank the error message error[0] = 0; } - } - } - return ret; + } + } + return ret; } /** @@ -9116,25 +9119,25 @@ static bool blr_apply_changes(ROUTER_INSTANCE *router, /* MariaDB 10 GTID request */ if (router->mariadb10_master_gtid) { - if (change_master.use_mariadb10_gtid) - { + if (change_master.use_mariadb10_gtid) + { /* MASTER_USE_GTID=Slave_pos is set */ MXS_INFO("%s: MASTER_USE_GTID is [%s]", router->service->name, change_master.use_mariadb10_gtid); - } + } - /* Always log the current GTID value with CHANGE_MASTER TO */ - MXS_INFO("%s: CHANGE MASTER TO, current GTID value is [%s]", - router->service->name, - router->last_mariadb_gtid); + /* Always log the current GTID value with CHANGE_MASTER TO */ + MXS_INFO("%s: CHANGE MASTER TO, current GTID value is [%s]", + router->service->name, + router->last_mariadb_gtid); - /* Always set empty filename at pos 4 with CHANGE_MASTER TO */ - strcpy(router->binlog_name, ""); + /* Always set empty filename at pos 4 with CHANGE_MASTER TO */ + strcpy(router->binlog_name, ""); - router->current_pos = 4; - router->binlog_position = 4; - router->current_safe_event = 4; + router->current_pos = 4; + router->binlog_position = 4; + router->current_safe_event = 4; } /* The new filename is not the current one */ else if (strcmp(new_logfile, router->binlog_name) != 0 && diff --git a/server/modules/routing/binlogrouter/maxbinlogcheck.c b/server/modules/routing/binlogrouter/maxbinlogcheck.c index 328eb6e22..953c1053a 100644 --- a/server/modules/routing/binlogrouter/maxbinlogcheck.c +++ b/server/modules/routing/binlogrouter/maxbinlogcheck.c @@ -262,7 +262,8 @@ printUsage(const char *progname) printVersion(progname); printf("The MaxScale binlog check utility.\n\n"); - printf("Usage: %s [-f] [-M] [-d] [-V] [-H] [-K file] [-A algo] [-R pos] [-T pos] []\n\n", progname); + printf("Usage: %s [-f] [-M] [-d] [-V] [-H] [-K file] [-A algo] [-R pos] [-T pos] []\n\n", + progname); printf(" -f|--fix Fix binlog file, require write permissions (truncate)\n"); printf(" -d|--debug Print debug messages\n"); printf(" -M|--mariadb10 MariaDB 10 binlog compatibility\n"); diff --git a/server/modules/routing/binlogrouter/test/testbinlog.c b/server/modules/routing/binlogrouter/test/testbinlog.c index 367f4450f..421b18a56 100644 --- a/server/modules/routing/binlogrouter/test/testbinlog.c +++ b/server/modules/routing/binlogrouter/test/testbinlog.c @@ -773,8 +773,8 @@ int main(int argc, char **argv) inst->current_pos = 328; strcpy(inst->fileroot, "file"); strcpy(query, - "CHANGE MASTER TO MASTER_LOG_POS=1991, MASTER_USE_GTID=Slave_pos, " - "MASTER_LOG_FILE=''"); + "CHANGE MASTER TO MASTER_LOG_POS=1991, MASTER_USE_GTID=Slave_pos, " + "MASTER_LOG_FILE=''"); rc = blr_test_handle_change_master(inst, query, error_string); @@ -791,7 +791,7 @@ int main(int argc, char **argv) printf("Test %d PASSED, GTID set MASTER_USE_GTID=Slave_pos " "for [%s]: %s\n", tests, - query,error_string); + query, error_string); } tests++; @@ -799,8 +799,10 @@ int main(int argc, char **argv) /** * Verify SQL query initial comment skipping function works on a real use case. */ - const char *mysql_connector_j_actual = blr_skip_leading_sql_comments("/* mysql-connector-java-5.1.39 ( Revision: 3289a357af6d09ecc1a10fd3c26e95183e5790ad ) */SELECT @@session.auto_increment_increment AS auto_increment_increment, @@character_set_client AS character_set_client, @@character_set_connection AS character_set_connection, @@character_set_results AS character_set_results, @@character_set_server AS character_set_server, @@init_connect AS init_connect, @@interactive_timeout AS interactive_timeout, @@license AS license, @@lower_case_table_names AS lower_case_table_names, @@max_allowed_packet AS max_allowed_packet, @@net_buffer_length AS net_buffer_length, @@net_write_timeout AS net_write_timeout, @@query_cache_size AS query_cache_size, @@query_cache_type AS query_cache_type, @@sql_mode AS sql_mode, @@system_time_zone AS system_time_zone, @@time_zone AS time_zone, @@tx_isolation AS tx_isolation, @@wait_timeout AS wait_timeout"); - const char *mysql_connector_j_expected = "SELECT @@session.auto_increment_increment AS auto_increment_increment, @@character_set_client AS character_set_client, @@character_set_connection AS character_set_connection, @@character_set_results AS character_set_results, @@character_set_server AS character_set_server, @@init_connect AS init_connect, @@interactive_timeout AS interactive_timeout, @@license AS license, @@lower_case_table_names AS lower_case_table_names, @@max_allowed_packet AS max_allowed_packet, @@net_buffer_length AS net_buffer_length, @@net_write_timeout AS net_write_timeout, @@query_cache_size AS query_cache_size, @@query_cache_type AS query_cache_type, @@sql_mode AS sql_mode, @@system_time_zone AS system_time_zone, @@time_zone AS time_zone, @@tx_isolation AS tx_isolation, @@wait_timeout AS wait_timeout"; + const char *mysql_connector_j_actual = + blr_skip_leading_sql_comments("/* mysql-connector-java-5.1.39 ( Revision: 3289a357af6d09ecc1a10fd3c26e95183e5790ad ) */SELECT @@session.auto_increment_increment AS auto_increment_increment, @@character_set_client AS character_set_client, @@character_set_connection AS character_set_connection, @@character_set_results AS character_set_results, @@character_set_server AS character_set_server, @@init_connect AS init_connect, @@interactive_timeout AS interactive_timeout, @@license AS license, @@lower_case_table_names AS lower_case_table_names, @@max_allowed_packet AS max_allowed_packet, @@net_buffer_length AS net_buffer_length, @@net_write_timeout AS net_write_timeout, @@query_cache_size AS query_cache_size, @@query_cache_type AS query_cache_type, @@sql_mode AS sql_mode, @@system_time_zone AS system_time_zone, @@time_zone AS time_zone, @@tx_isolation AS tx_isolation, @@wait_timeout AS wait_timeout"); + const char *mysql_connector_j_expected = + "SELECT @@session.auto_increment_increment AS auto_increment_increment, @@character_set_client AS character_set_client, @@character_set_connection AS character_set_connection, @@character_set_results AS character_set_results, @@character_set_server AS character_set_server, @@init_connect AS init_connect, @@interactive_timeout AS interactive_timeout, @@license AS license, @@lower_case_table_names AS lower_case_table_names, @@max_allowed_packet AS max_allowed_packet, @@net_buffer_length AS net_buffer_length, @@net_write_timeout AS net_write_timeout, @@query_cache_size AS query_cache_size, @@query_cache_type AS query_cache_type, @@sql_mode AS sql_mode, @@system_time_zone AS system_time_zone, @@time_zone AS time_zone, @@tx_isolation AS tx_isolation, @@wait_timeout AS wait_timeout"; if (strcmp(mysql_connector_j_actual, mysql_connector_j_expected) == 0) { printf("Test %d PASSED\n", tests); diff --git a/server/modules/routing/debugcli/debugcmd.c b/server/modules/routing/debugcli/debugcmd.c index f7e1b0aaa..a910d8a2e 100644 --- a/server/modules/routing/debugcli/debugcmd.c +++ b/server/modules/routing/debugcli/debugcmd.c @@ -931,7 +931,7 @@ struct subcommand addoptions[] = { { "user", 2, 2, inet_add_admin_user, - "Add an administrative account for using maxadmin over the network", + "Add an administrative account for using maxadmin over the network", "Usage: add user USER PASSWORD\n" "\n" "Parameters:\n"