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

Format routers and monitors

Browse Source
This commit is contained in:
Markus Mäkelä
2019-05-09 11:05:34 +03:00
parent 6625c1296b
commit 418ccf861d
42 changed files with 358 additions and 340 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
server/modules/routing/avrorouter/avro_main.cc
View File

@ -218,7 +218,7 @@ static json_t* diagnostics_json(const MXS_ROUTER* router)
static void clientReply(MXS_ROUTER* instance,
MXS_ROUTER_SESSION* router_session,
GWBUF* queue,
DCB* backend_dcb)
DCB* backend_dcb)
{
/** We should never end up here */
mxb_assert(false);
@ -241,7 +241,7 @@ static void clientReply(MXS_ROUTER* instance,
static void errorReply(MXS_ROUTER* instance,
MXS_ROUTER_SESSION* router_session,
GWBUF* message,
DCB* backend_dcb,
DCB* backend_dcb,
mxs_error_action_t action,
bool* succp)
{
@ -493,6 +493,8 @@ extern "C" MXS_MODULE* MXS_CREATE_MODULE()
NULL
};
auto caps = RCAP_TYPE_NO_RSESSION | RCAP_TYPE_NO_AUTH;
static MXS_MODULE info =
{
MXS_MODULE_API_ROUTER,
@ -500,12 +502,12 @@ extern "C" MXS_MODULE* MXS_CREATE_MODULE()
MXS_ROUTER_VERSION,
"Binlogrouter",
"V1.0.0",
RCAP_TYPE_NO_RSESSION | RCAP_TYPE_NO_AUTH,
caps,
&MyObject,
NULL, /* Process init. */
NULL, /* Process finish. */
NULL, /* Thread init. */
NULL, /* Thread finish. */
NULL,
NULL,
NULL,
NULL,
{
{
"binlogdir",
@ -525,17 +527,17 @@ extern "C" MXS_MODULE* MXS_CREATE_MODULE()
| MXS_MODULE_OPT_PATH_X_OK
| MXS_MODULE_OPT_PATH_CREAT
},
{"source", MXS_MODULE_PARAM_SERVICE},
{"filestem", MXS_MODULE_PARAM_STRING, BINLOG_NAME_ROOT},
{"group_rows", MXS_MODULE_PARAM_COUNT, "1000"},
{"group_trx", MXS_MODULE_PARAM_COUNT, "1"},
{"start_index", MXS_MODULE_PARAM_COUNT, "1"},
{"block_size", MXS_MODULE_PARAM_SIZE, "0"},
{"codec", MXS_MODULE_PARAM_ENUM, "null", MXS_MODULE_OPT_ENUM_UNIQUE, codec_values},
{"match", MXS_MODULE_PARAM_REGEX},
{"exclude", MXS_MODULE_PARAM_REGEX},
{"server_id", MXS_MODULE_PARAM_STRING, "1234"},
{"gtid_start_pos", MXS_MODULE_PARAM_STRING},
{"source", MXS_MODULE_PARAM_SERVICE},
{"filestem", MXS_MODULE_PARAM_STRING, BINLOG_NAME_ROOT},
{"group_rows", MXS_MODULE_PARAM_COUNT, "1000"},
{"group_trx", MXS_MODULE_PARAM_COUNT, "1"},
{"start_index", MXS_MODULE_PARAM_COUNT, "1"},
{"block_size", MXS_MODULE_PARAM_SIZE, "0"},
{"codec", MXS_MODULE_PARAM_ENUM, "null", MXS_MODULE_OPT_ENUM_UNIQUE, codec_values},
{"match", MXS_MODULE_PARAM_REGEX },
{"exclude", MXS_MODULE_PARAM_REGEX },
{"server_id", MXS_MODULE_PARAM_STRING, "1234"},
{"gtid_start_pos", MXS_MODULE_PARAM_STRING },
{MXS_END_MODULE_PARAMS}
}
};

6
server/modules/routing/avrorouter/avrorouter.hh
View File

@ -105,7 +105,7 @@ enum mxs_avro_codec_type
static const MXS_ENUM_VALUE codec_values[] =
{
{"null", MXS_AVRO_CODEC_NULL},
{"null", MXS_AVRO_CODEC_NULL },
{"deflate", MXS_AVRO_CODEC_DEFLATE},
// Not yet implemented
// {"snappy", MXS_AVRO_CODEC_SNAPPY},
@ -191,7 +191,7 @@ private:
};
void read_table_info(uint8_t* ptr,
uint8_t post_header_len,
uint8_t post_header_len,
uint64_t* table_id,
char* dest,
size_t len);
@ -207,7 +207,7 @@ void read_table_identifier(const char* db,
const char* sql,
const char* end,
char* dest,
int size);
int size);
int avro_client_handle_request(Avro*, AvroSession*, GWBUF*);
void avro_client_rotate(Avro* router, AvroSession* client, uint8_t* ptr);
bool avro_open_binlog(const char* binlogdir, const char* file, int* fd);

2
server/modules/routing/avrorouter/rpl.cc
View File

@ -613,7 +613,7 @@ Rpl::Rpl(SERVICE* service,
SRowEventHandler handler,
pcre2_code* match,
pcre2_code* exclude,
gtid_pos_t gtid)
gtid_pos_t gtid)
: m_handler(handler)
, m_service(service)
, m_binlog_checksum(0)