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/filter/cache/cachefilter.cc vendored
View File

@ -134,7 +134,7 @@ extern "C" MXS_MODULE* MXS_CREATE_MODULE()
MXS_FILTER_VERSION,
"A caching filter that is capable of caching and returning cached data.",
VERSION_STRING,
MXS_NO_MODULE_CAPABILITIES,
RCAP_TYPE_TRANSACTION_TRACKING,
&CacheFilter::s_object,
NULL, /* Process init. */
NULL, /* Process finish. */
@ -274,7 +274,7 @@ void CacheFilter::diagnostics(DCB* pDcb)
uint64_t CacheFilter::getCapabilities()
{
return RCAP_TYPE_TRANSACTION_TRACKING;
return RCAP_TYPE_NONE;
}
// static

4
server/modules/filter/ccrfilter/ccrfilter.c
View File

@ -134,7 +134,7 @@ MXS_MODULE* MXS_CREATE_MODULE()
MXS_FILTER_VERSION,
"A routing hint filter that send queries to the master after data modification",
"V1.1.0",
MXS_NO_MODULE_CAPABILITIES,
RCAP_TYPE_CONTIGUOUS_INPUT,
&MyObject,
NULL, /* Process init. */
NULL, /* Process finish. */
@ -389,5 +389,5 @@ diagnostic(MXS_FILTER *instance, MXS_FILTER_SESSION *fsession, DCB *dcb)
*/
static uint64_t getCapabilities(MXS_FILTER* instance)
{
return RCAP_TYPE_CONTIGUOUS_INPUT;
return RCAP_TYPE_NONE;
}

4
server/modules/filter/dbfwfilter/dbfwfilter.c
View File

@ -827,7 +827,7 @@ MXS_MODULE* MXS_CREATE_MODULE()
MXS_FILTER_VERSION,
"Firewall Filter",
"V1.2.0",
MXS_NO_MODULE_CAPABILITIES,
RCAP_TYPE_STMT_INPUT,
&MyObject,
NULL, /* Process init. */
NULL, /* Process finish. */
@ -2506,5 +2506,5 @@ diagnostic(MXS_FILTER *instance, MXS_FILTER_SESSION *fsession, DCB *dcb)
*/
static uint64_t getCapabilities(MXS_FILTER* instance)
{
return RCAP_TYPE_STMT_INPUT;
return RCAP_TYPE_NONE;
}

4
server/modules/filter/hintfilter/hintfilter.c
View File

@ -67,7 +67,7 @@ MXS_MODULE* MXS_CREATE_MODULE()
MXS_FILTER_VERSION,
"A hint parsing filter",
"V1.0.0",
MXS_NO_MODULE_CAPABILITIES,
RCAP_TYPE_CONTIGUOUS_INPUT,
&MyObject,
NULL, /* Process init. */
NULL, /* Process finish. */
@ -241,5 +241,5 @@ diagnostic(MXS_FILTER *instance, MXS_FILTER_SESSION *fsession, DCB *dcb)
*/
static uint64_t getCapabilities(MXS_FILTER* instance)
{
return RCAP_TYPE_CONTIGUOUS_INPUT;
return RCAP_TYPE_NONE;
}

4
server/modules/filter/insertstream/insertstream.c
View File

@ -110,7 +110,7 @@ MXS_MODULE* MXS_CREATE_MODULE()
MXS_FILTER_VERSION,
"Data streaming filter",
"1.0.0",
MXS_NO_MODULE_CAPABILITIES,
RCAP_TYPE_TRANSACTION_TRACKING,
&MyObject,
NULL,
NULL,
@ -520,7 +520,7 @@ static void diagnostic(MXS_FILTER *instance, MXS_FILTER_SESSION *fsession, DCB *
*/
static uint64_t getCapabilities(MXS_FILTER* instance)
{
return RCAP_TYPE_TRANSACTION_TRACKING;
return RCAP_TYPE_NONE;
}
/**

4
server/modules/filter/luafilter/luafilter.c
View File

@ -98,7 +98,7 @@ MXS_MODULE* MXS_CREATE_MODULE()
MXS_FILTER_VERSION,
"Lua Filter",
"V1.0.0",
MXS_NO_MODULE_CAPABILITIES,
RCAP_TYPE_CONTIGUOUS_INPUT,
&MyObject,
NULL, /* Process init. */
NULL, /* Process finish. */
@ -671,5 +671,5 @@ static void diagnostic(MXS_FILTER *instance, MXS_FILTER_SESSION *fsession, DCB *
*/
static uint64_t getCapabilities(MXS_FILTER *instance)
{
return RCAP_TYPE_CONTIGUOUS_INPUT;
return RCAP_TYPE_NONE;
}

4
server/modules/filter/masking/maskingfilter.cc
View File

@ -78,7 +78,7 @@ extern "C" MXS_MODULE* MXS_CREATE_MODULE()
MXS_FILTER_VERSION,
"A masking filter that is capable of masking/obfuscating returned column values.",
"V1.0.0",
MXS_NO_MODULE_CAPABILITIES,
RCAP_TYPE_STMT_INPUT | RCAP_TYPE_CONTIGUOUS_OUTPUT,
&MaskingFilter::s_object,
NULL, /* Process init. */
NULL, /* Process finish. */
@ -146,7 +146,7 @@ void MaskingFilter::diagnostics(DCB* pDcb)
// static
uint64_t MaskingFilter::getCapabilities()
{
return RCAP_TYPE_STMT_INPUT | RCAP_TYPE_CONTIGUOUS_OUTPUT;
return RCAP_TYPE_NONE;
}
std::tr1::shared_ptr<MaskingRules> MaskingFilter::rules() const

4
server/modules/filter/maxrows/maxrows.c
View File

@ -88,7 +88,7 @@ MXS_MODULE* MXS_CREATE_MODULE()
MXS_FILTER_VERSION,
"A filter that is capable of limiting the resultset number of rows.",
"V1.0.0",
MXS_NO_MODULE_CAPABILITIES,
RCAP_TYPE_STMT_INPUT | RCAP_TYPE_STMT_OUTPUT,
&object,
NULL, /* Process init. */
NULL, /* Process finish. */
@ -423,7 +423,7 @@ static void diagnostics(MXS_FILTER *instance, MXS_FILTER_SESSION *sdata, DCB *dc
*/
static uint64_t getCapabilities(MXS_FILTER* instance)
{
return RCAP_TYPE_STMT_INPUT | RCAP_TYPE_STMT_OUTPUT;
return RCAP_TYPE_NONE;
}
/* API END */

4
server/modules/filter/mqfilter/mqfilter.c
View File

@ -281,7 +281,7 @@ MXS_MODULE* MXS_CREATE_MODULE()
MXS_FILTER_VERSION,
"A RabbitMQ query logging filter",
"V1.0.2",
MXS_NO_MODULE_CAPABILITIES,
RCAP_TYPE_CONTIGUOUS_INPUT,
&MyObject,
NULL, /* Process init. */
NULL, /* Process finish. */
@ -1513,5 +1513,5 @@ diagnostic(MXS_FILTER *instance, MXS_FILTER_SESSION *fsession, DCB *dcb)
*/
static uint64_t getCapabilities(MXS_FILTER* instance)
{
return RCAP_TYPE_CONTIGUOUS_INPUT;
return RCAP_TYPE_NONE;
}

4
server/modules/filter/namedserverfilter/namedserverfilter.cc
View File

@ -219,7 +219,7 @@ RegexHintFilter::find_servers(char* sql, int sql_len, pcre2_match_data* match_da
*/
uint64_t RegexHintFilter::getCapabilities()
{
return RCAP_TYPE_CONTIGUOUS_INPUT;
return RCAP_TYPE_NONE;
}
/**
@ -780,7 +780,7 @@ extern "C" MXS_MODULE* MXS_CREATE_MODULE()
MXS_FILTER_VERSION,
"A routing hint filter that uses regular expressions to direct queries",
"V1.1.0",
MXS_NO_MODULE_CAPABILITIES,
RCAP_TYPE_CONTIGUOUS_INPUT,
&MyObject,
NULL, /* Process init. */
NULL, /* Process finish. */

4
server/modules/filter/qlafilter/qlafilter.c
View File

@ -193,7 +193,7 @@ MXS_MODULE* MXS_CREATE_MODULE()
MXS_FILTER_VERSION,
"A simple query logging filter",
"V1.1.1",
MXS_NO_MODULE_CAPABILITIES,
RCAP_TYPE_CONTIGUOUS_INPUT,
&MyObject,
NULL, /* Process init. */
NULL, /* Process finish. */
@ -620,7 +620,7 @@ diagnostic(MXS_FILTER *instance, MXS_FILTER_SESSION *fsession, DCB *dcb)
*/
static uint64_t getCapabilities(MXS_FILTER* instance)
{
return RCAP_TYPE_CONTIGUOUS_INPUT;
return RCAP_TYPE_NONE;
}
/**
* Open the log file and print a header if appropriate.

4
server/modules/filter/regexfilter/regexfilter.c
View File

@ -123,7 +123,7 @@ MXS_MODULE* MXS_CREATE_MODULE()
MXS_FILTER_VERSION,
"A query rewrite filter that uses regular expressions to rewrite queries",
"V1.1.0",
MXS_NO_MODULE_CAPABILITIES,
RCAP_TYPE_CONTIGUOUS_INPUT,
&MyObject,
NULL, /* Process init. */
NULL, /* Process finish. */
@ -493,5 +493,5 @@ void log_nomatch(REGEX_INSTANCE* inst, char* re, char* old)
*/
static uint64_t getCapabilities(MXS_FILTER* instance)
{
return RCAP_TYPE_CONTIGUOUS_INPUT;
return RCAP_TYPE_NONE;
}

4
server/modules/filter/tee/tee.c
View File

@ -326,7 +326,7 @@ MXS_MODULE* MXS_CREATE_MODULE()
MXS_FILTER_VERSION,
"A tee piece in the filter plumbing",
"V1.0.0",
MXS_NO_MODULE_CAPABILITIES,
RCAP_TYPE_CONTIGUOUS_INPUT,
&MyObject,
NULL, /* Process init. */
NULL, /* Process finish. */
@ -743,7 +743,7 @@ diagnostic(MXS_FILTER *instance, MXS_FILTER_SESSION *fsession, DCB *dcb)
*/
static uint64_t getCapabilities(MXS_FILTER* instance)
{
return RCAP_TYPE_CONTIGUOUS_INPUT;
return RCAP_TYPE_NONE;
}
/**

4
server/modules/filter/topfilter/topfilter.c
View File

@ -157,7 +157,7 @@ MXS_MODULE* MXS_CREATE_MODULE()
MXS_FILTER_VERSION,
"A top N query logging filter",
"V1.0.1",
MXS_NO_MODULE_CAPABILITIES,
RCAP_TYPE_CONTIGUOUS_INPUT,
&MyObject,
NULL, /* Process init. */
NULL, /* Process finish. */
@ -631,5 +631,5 @@ diagnostic(MXS_FILTER *instance, MXS_FILTER_SESSION *fsession, DCB *dcb)
*/
static uint64_t getCapabilities(MXS_FILTER* instance)
{
return RCAP_TYPE_CONTIGUOUS_INPUT;
return RCAP_TYPE_NONE;
}

4
server/modules/filter/tpmfilter/tpmfilter.c
View File

@ -167,7 +167,7 @@ MXS_MODULE* MXS_CREATE_MODULE()
MXS_FILTER_VERSION,
"Transaction Performance Monitoring filter",
"V1.0.1",
MXS_NO_MODULE_CAPABILITIES,
RCAP_TYPE_CONTIGUOUS_INPUT,
&MyObject,
NULL, /* Process init. */
NULL, /* Process finish. */
@ -605,7 +605,7 @@ diagnostic(MXS_FILTER *instance, MXS_FILTER_SESSION *fsession, DCB *dcb)
*/
static uint64_t getCapabilities(MXS_FILTER* instance)
{
return RCAP_TYPE_CONTIGUOUS_INPUT;
return RCAP_TYPE_NONE;
}
static void checkNamedPipe(void *args)