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

36
server/modules/routing/schemarouter/schemarouterinstance.cc
View File

@ -280,29 +280,35 @@ uint64_t SchemaRouter::getCapabilities()
*/
extern "C" MXS_MODULE* MXS_CREATE_MODULE()
{
static auto caps = RCAP_TYPE_CONTIGUOUS_INPUT | RCAP_TYPE_RUNTIME_CONFIG;
static auto desc = "A database sharding router for simple sharding";
static MXS_MODULE info =
{
MXS_MODULE_API_ROUTER,
MXS_MODULE_BETA_RELEASE,
MXS_ROUTER_VERSION,
"A database sharding router for simple sharding",
desc,
"V1.0.0",
RCAP_TYPE_CONTIGUOUS_INPUT | RCAP_TYPE_RUNTIME_CONFIG,
caps,
&schemarouter::SchemaRouter::s_object,
NULL, /* Process init. */
NULL, /* Process finish. */
NULL, /* Thread init. */
NULL, /* Thread finish. */
NULL,
NULL,
NULL,
NULL,
{
{"ignore_databases", MXS_MODULE_PARAM_STRING },
{"ignore_databases_regex", MXS_MODULE_PARAM_STRING },
{"max_sescmd_history", MXS_MODULE_PARAM_COUNT, "0"},
{"disable_sescmd_history", MXS_MODULE_PARAM_BOOL, "false"},
{"refresh_databases", MXS_MODULE_PARAM_BOOL, "true"},
{"refresh_interval", MXS_MODULE_PARAM_DURATION, DEFAULT_REFRESH_INTERVAL,
MXS_MODULE_OPT_DURATION_S },
{"debug", MXS_MODULE_PARAM_BOOL, "false"},
{"preferred_server", MXS_MODULE_PARAM_SERVER },
{"ignore_databases", MXS_MODULE_PARAM_STRING },
{"ignore_databases_regex", MXS_MODULE_PARAM_STRING },
{"max_sescmd_history", MXS_MODULE_PARAM_COUNT, "0"},
{"disable_sescmd_history", MXS_MODULE_PARAM_BOOL, "false"},
{"refresh_databases", MXS_MODULE_PARAM_BOOL, "true"},
{
"refresh_interval",
MXS_MODULE_PARAM_DURATION,
DEFAULT_REFRESH_INTERVAL,
MXS_MODULE_OPT_DURATION_S
},
{"debug", MXS_MODULE_PARAM_BOOL, "false"},
{"preferred_server", MXS_MODULE_PARAM_SERVER },
{MXS_END_MODULE_PARAMS}
}
};

4
server/modules/routing/schemarouter/schemaroutersession.cc
View File

@ -204,7 +204,7 @@ static void inspect_query(GWBUF* pPacket, uint32_t* type, qc_query_op_t* op, uin
SERVER* SchemaRouterSession::resolve_query_target(GWBUF* pPacket,
uint32_t type,
uint8_t command,
uint8_t command,
enum route_target& route_target)
{
SERVER* target = NULL;
@ -604,7 +604,7 @@ void SchemaRouterSession::clientReply(GWBUF* pPacket, DCB* pDcb)
}
void SchemaRouterSession::handleError(GWBUF* pMessage,
DCB* pProblem,
DCB* pProblem,
mxs_error_action_t action,
bool* pSuccess)
{

4
server/modules/routing/schemarouter/schemaroutersession.hh
View File

@ -115,7 +115,7 @@ public:
* @param pSuccess On output, if false, the session will be terminated.
*/
void handleError(GWBUF* pMessage,
DCB* pProblem,
DCB* pProblem,
mxs_error_action_t action,
bool* pSuccess);
private:
@ -138,7 +138,7 @@ private:
void process_sescmd_response(SSRBackend& bref, GWBUF** ppPacket);
SERVER* resolve_query_target(GWBUF* pPacket,
uint32_t type,
uint8_t command,
uint8_t command,
enum route_target& route_target);
/** Shard mapping functions */