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

qc: Implement qc_get_function_info for qc_mysqlembedded

Browse Source 
MXS-1070

Now both qc_mysqlembedded and qc_sqlite return the same stuff
for the same statement, and both include also operators in
addition to pure functions. Whether that is the right approach,
is still subject to debate.

However, if we want to make it possible to disable e.g. the
use of concat as in "select concat(a) from t", where a is a string,
to prevent the bypassing of the masking filter, then conceptually
it should be possible to prevent "select a+0 from t", where a is an
int, as well.
This commit is contained in:
Johan Wikman
2017-01-04 18:29:40 +02:00
parent 0d561df880
commit 482fbe6400
8 changed files with 368 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
query_classifier/qc_sqlite/builtin_functions.c
View File

@ -206,6 +206,7 @@ static const char* BUILTIN_FUNCTIONS[] =
"ST_AsText",
"ST_ASWKT",
"ST_GeomCollFromText",
"ST_GeometryFromText",
"ST_LineFromText",
"ST_PointFromText",
"ST_PolyFromText",

138
query_classifier/qc_sqlite/qc_sqlite.c
View File

@ -211,6 +211,8 @@ extern void exposed_sqlite3StartTable(Parse *pParse, /* Parser context */
int noErr); /* Do nothing if table already exists */
extern void maxscaleCollectInfoFromSelect(Parse*, Select*, int);
extern void maxscale_update_function_info(const char* name, uint32_t usage);
/**
* Used for freeing a QC_SQLITE_INFO object added to a GWBUF.
*
@ -808,6 +810,13 @@ static void update_function_info(QC_SQLITE_INFO* info,
}
}
extern void maxscale_update_function_info(const char* name, uint32_t usage)
{
QC_SQLITE_INFO* info = this_thread.info;
update_function_info(info, name, usage);
}
static void update_field_infos_from_expr(QC_SQLITE_INFO* info,
const struct Expr* pExpr,
uint32_t usage,
@ -878,6 +887,73 @@ static void update_field_infos_from_expr(QC_SQLITE_INFO* info,
}
}
static const char* get_token_symbol(int token)
{
switch (token)
{
case TK_EQ:
return "=";
case TK_GE:
return ">=";
case TK_GT:
return ">";
case TK_LE:
return "<=";
case TK_LT:
return "<";
case TK_NE:
return "<>";
case TK_BETWEEN:
return "between";
case TK_BITAND:
return "&";
case TK_BITOR:
return "|";
case TK_CASE:
return "case";
case TK_IN:
return "in";
case TK_ISNULL:
return "isnull";
case TK_MINUS:
return "-";
case TK_NOTNULL:
return "isnotnull";
case TK_PLUS:
return "+";
case TK_REM:
return "%";
case TK_SLASH:
return "/";
case TK_STAR:
return "*";
case TK_UMINUS:
return "-";
default:
ss_dassert(!true);
return "";
}
}
static void update_field_infos(QC_SQLITE_INFO* info,
int prev_token,
@ -953,18 +1029,64 @@ static void update_field_infos(QC_SQLITE_INFO* info,
case TK_FUNCTION:
case TK_IN:
case TK_SELECT:
if ((pExpr->op == TK_FUNCTION) && zToken)
switch (pExpr->op)
{
if (strcasecmp(zToken, "last_insert_id") == 0)
case TK_EQ:
// We don't report "=" if it's not used in a specific context (SELECT, WHERE)
// and if it is used in SET. We also exclude it it in a context where a
// variable is set.
if (((usage != 0) && (usage != QC_USED_IN_SET)) &&
(!pExpr->pLeft || (pExpr->pLeft->op != TK_VARIABLE)))
{
info->types |= (QUERY_TYPE_READ | QUERY_TYPE_MASTER_READ);
}
else if (!is_builtin_readonly_function(zToken))
{
info->types |= QUERY_TYPE_WRITE;
update_function_info(info, get_token_symbol(pExpr->op), usage);
}
break;
update_function_info(info, zToken, usage);
case TK_GE:
case TK_GT:
case TK_LE:
case TK_LT:
case TK_NE:
case TK_BETWEEN:
case TK_BITAND:
case TK_BITOR:
case TK_CASE:
case TK_IN:
case TK_ISNULL:
case TK_MINUS:
case TK_NOTNULL:
case TK_PLUS:
case TK_REM:
case TK_SLASH:
case TK_STAR:
case TK_UMINUS:
update_function_info(info, get_token_symbol(pExpr->op), usage);
break;
case TK_FUNCTION:
if (zToken)
{
if (strcasecmp(zToken, "last_insert_id") == 0)
{
info->types |= (QUERY_TYPE_READ | QUERY_TYPE_MASTER_READ);
}
else if (!is_builtin_readonly_function(zToken))
{
info->types |= QUERY_TYPE_WRITE;
}
// We exclude "row", because we cannot detect all rows the same
// way qc_mysqlembedded does.
if (strcasecmp(zToken, "row") != 0)
{
update_function_info(info, zToken, usage);
}
}
break;
default:
break;
}
if (pExpr->pLeft)

13
query_classifier/qc_sqlite/sqlite-src-3110100/src/parse.y
View File

@ -66,6 +66,15 @@ enum
QUERY_TYPE_WRITE = 0x000004, /*< Master data will be modified:master */
};
typedef enum qc_field_usage
{
QC_USED_IN_SELECT = 0x01, /*< SELECT fld FROM... */
QC_USED_IN_SUBSELECT = 0x02, /*< SELECT 1 FROM ... SELECT fld ... */
QC_USED_IN_WHERE = 0x04, /*< SELECT ... FROM ... WHERE fld = ... */
QC_USED_IN_SET = 0x08, /*< UPDATE ... SET fld = ... */
QC_USED_IN_GROUP_BY = 0x10, /*< ... GROUP BY fld */
} qc_field_usage_t;
// MaxScale naming convention:
//
// - A function that "overloads" a sqlite3 function has the same name
@ -116,6 +125,8 @@ extern void maxscaleShow(Parse*, MxsShow* pShow);
extern void maxscaleTruncate(Parse*, Token* pDatabase, Token* pName);
extern void maxscaleUse(Parse*, Token*);
extern void maxscale_update_function_info(const char* name, unsigned usage);
// Exposed utility functions
void exposed_sqlite3ExprDelete(sqlite3 *db, Expr *pExpr)
{
@ -1141,6 +1152,8 @@ selcollist(A) ::= sclp(P) DEFAULT LP nm RP as. {
A = P;
}
selcollist(A) ::= sclp(P) MATCH LP id(X) RP AGAINST LP expr(Y) RP. {
// Could be a subselect as well, but we just don't know it at this point.
maxscale_update_function_info("match", QC_USED_IN_SELECT);
sqlite3ExprDelete(pParse->db, Y.pExpr);
Expr *p = sqlite3PExpr(pParse, TK_ID, 0, 0, &X);
A = sqlite3ExprListAppend(pParse, P, p);