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

Take static module capabilities into use

Browse Source 
The static module capabilities are now used to query the capabilities of
filters and routers. The new RCAP_TYPE_NOAUTH capability is also taken
into use. These changes removes the need for the `is_internal_service`
function.
This commit is contained in:
Markus Mäkelä
2017-03-20 10:44:05 +02:00
parent 1736aca7f7
commit 039f6e3487
29 changed files with 60 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/modules/routing/avrorouter/avro.c
View File

@ -170,7 +170,7 @@ MXS_MODULE* MXS_CREATE_MODULE()
MXS_ROUTER_VERSION,
"Binlogrouter",
"V1.0.0",
MXS_NO_MODULE_CAPABILITIES,
RCAP_TYPE_NO_RSESSION | RCAP_TYPE_NO_AUTH,
&MyObject,
NULL, /* Process init. */
NULL, /* Process finish. */
@ -1019,7 +1019,7 @@ errorReply(MXS_ROUTER *instance, MXS_ROUTER_SESSION *router_session, GWBUF *mess
static uint64_t getCapabilities(MXS_ROUTER* instance)
{
return RCAP_TYPE_NO_RSESSION;
return RCAP_TYPE_NONE;
}
/**

5
server/modules/routing/binlogrouter/blr.c
View File

@ -171,7 +171,8 @@ MXS_MODULE* MXS_CREATE_MODULE()
MXS_ROUTER_VERSION,
"Binlogrouter",
"V2.1.0",
MXS_NO_MODULE_CAPABILITIES,
RCAP_TYPE_NO_RSESSION | RCAP_TYPE_CONTIGUOUS_OUTPUT |
RCAP_TYPE_RESULTSET_OUTPUT | RCAP_TYPE_NO_AUTH,
&MyObject,
NULL, /* Process init. */
NULL, /* Process finish. */
@ -1891,7 +1892,7 @@ static void rses_end_locked_router_action(ROUTER_SLAVE *rses)
static uint64_t getCapabilities(MXS_ROUTER* instance)
{
return RCAP_TYPE_NO_RSESSION | RCAP_TYPE_CONTIGUOUS_OUTPUT | RCAP_TYPE_RESULTSET_OUTPUT;
return RCAP_TYPE_NONE;
}
/**

4
server/modules/routing/cli/cli.c
View File

@ -91,7 +91,7 @@ MXS_MODULE* MXS_CREATE_MODULE()
MXS_ROUTER_VERSION,
"The admin user interface",
"V1.0.0",
MXS_NO_MODULE_CAPABILITIES,
RCAP_TYPE_NO_AUTH,
&MyObject,
NULL, /* Process init. */
NULL, /* Process finish. */
@ -290,5 +290,5 @@ diagnostics(MXS_ROUTER *instance, DCB *dcb)
static uint64_t getCapabilities(MXS_ROUTER *instance)
{
return 0;
return RCAP_TYPE_NONE;
}

4
server/modules/routing/debugcli/debugcli.c
View File

@ -90,7 +90,7 @@ MXS_MODULE* MXS_CREATE_MODULE()
MXS_ROUTER_VERSION,
"The debug user interface",
"V1.1.1",
MXS_NO_MODULE_CAPABILITIES,
RCAP_TYPE_NO_AUTH,
&MyObject,
NULL, /* Process init. */
NULL, /* Process finish. */
@ -295,5 +295,5 @@ diagnostics(MXS_ROUTER *instance, DCB *dcb)
static uint64_t getCapabilities(MXS_ROUTER* instance)
{
return 0;
return RCAP_TYPE_NONE;
}

4
server/modules/routing/hintrouter/hintrouter.cc
View File

@ -82,7 +82,7 @@ void HintRouter::diagnostics(DCB* pOut)
uint64_t HintRouter::getCapabilities()
{
HR_ENTRY();
return RCAP_TYPE_STMT_OUTPUT;
return RCAP_TYPE_NONE;
}
@ -95,7 +95,7 @@ extern "C" MXS_MODULE* MXS_CREATE_MODULE()
MXS_ROUTER_VERSION, /* Implemented module API version */
"A hint router", /* Description */
"V1.0.0", /* Module version */
MXS_NO_MODULE_CAPABILITIES,
RCAP_TYPE_STMT_OUTPUT,
&HintRouter::s_object,
NULL, /* Process init, can be null */
NULL, /* Process finish, can be null */

4
server/modules/routing/maxinfo/maxinfo.c
View File

@ -116,7 +116,7 @@ MXS_MODULE* MXS_CREATE_MODULE()
MXS_ROUTER_VERSION,
"The MaxScale Information Schema",
"V1.0.0",
MXS_NO_MODULE_CAPABILITIES,
RCAP_TYPE_NO_AUTH,
&MyObject,
NULL, /* Process init. */
NULL, /* Process finish. */
@ -382,7 +382,7 @@ diagnostics(MXS_ROUTER *instance, DCB *dcb)
static uint64_t
getCapabilities(MXS_ROUTER* instance)
{
return 0;
return RCAP_TYPE_NONE;
}

4
server/modules/routing/readwritesplit/readwritesplit.c
View File

@ -161,7 +161,7 @@ MXS_MODULE *MXS_CREATE_MODULE()
MXS_MODULE_API_ROUTER, MXS_MODULE_GA, MXS_ROUTER_VERSION,
"A Read/Write splitting router for enhancement read scalability",
"V1.1.0",
MXS_NO_MODULE_CAPABILITIES,
RCAP_TYPE_STMT_INPUT | RCAP_TYPE_TRANSACTION_TRACKING,
&MyObject,
NULL, /* Process init. */
NULL, /* Process finish. */
@ -821,7 +821,7 @@ static void clientReply(MXS_ROUTER *instance,
*/
static uint64_t getCapabilities(MXS_ROUTER* instance)
{
return RCAP_TYPE_STMT_INPUT | RCAP_TYPE_TRANSACTION_TRACKING;
return RCAP_TYPE_NONE;
}
/*

4
server/modules/routing/schemarouter/schemarouter.c
View File

@ -618,7 +618,7 @@ MXS_MODULE* MXS_CREATE_MODULE()
MXS_ROUTER_VERSION,
"A database sharding router for simple sharding",
"V1.0.0",
MXS_NO_MODULE_CAPABILITIES,
RCAP_TYPE_CONTIGUOUS_INPUT,
&MyObject,
NULL, /* Process init. */
NULL, /* Process finish. */
@ -3099,7 +3099,7 @@ static rses_property_t* mysql_sescmd_get_property(mysql_sescmd_t* scmd)
*/
static uint64_t getCapabilities(MXS_ROUTER* instance)
{
return RCAP_TYPE_CONTIGUOUS_INPUT;
return RCAP_TYPE_NONE;
}
/**