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

qc: Pick out the name in a PREPARE statement

Browse Source
This commit is contained in:
Johan Wikman
2016-10-26 13:32:32 +03:00
parent 7499c1e1bf
commit 23fdf1776c
2 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
query_classifier/qc_mysqlembedded/qc_mysqlembedded.cc
View File

@ -1912,7 +1912,17 @@ char* qc_get_prepare_name(GWBUF* stmt)
{ {
if (ensure_query_is_parsed(stmt)) if (ensure_query_is_parsed(stmt))
{ {
MXS_WARNING("qc_get_prepare_name not implemented yet."); LEX* lex = get_lex(stmt);
if (lex->sql_command == SQLCOM_PREPARE)
{
name = (char*)malloc(lex->prepared_stmt_name.length + 1);
if (name)
{
memcpy(name, lex->prepared_stmt_name.str, lex->prepared_stmt_name.length);
name[lex->prepared_stmt_name.length] = 0;
}
}
} }
} }

13
query_classifier/qc_sqlite/qc_sqlite.c
View File

@ -78,6 +78,7 @@ typedef struct qc_sqlite_info
size_t database_names_capacity; // The capacity of database_names. size_t database_names_capacity; // The capacity of database_names.
int keyword_1; // The first encountered keyword. int keyword_1; // The first encountered keyword.
int keyword_2; // The second encountered keyword. int keyword_2; // The second encountered keyword.
char* prepare_name; // The name of a prepared statement.
} QC_SQLITE_INFO; } QC_SQLITE_INFO;
typedef enum qc_log_level typedef enum qc_log_level
@ -1961,6 +1962,13 @@ void maxscalePrepare(Parse* pParse, Token* pName, Token* pStmt)
info->status = QC_QUERY_PARSED; info->status = QC_QUERY_PARSED;
info->types = QUERY_TYPE_PREPARE_NAMED_STMT; info->types = QUERY_TYPE_PREPARE_NAMED_STMT;
info->is_real_query = true; info->is_real_query = true;
info->prepare_name = MXS_MALLOC(pName->n + 1);
if (info->prepare_name)
{
memcpy(info->prepare_name, pName->z, pName->n);
info->prepare_name[pName->n] = 0;
}
} }
void maxscalePrivileges(Parse* pParse, int kind) void maxscalePrivileges(Parse* pParse, int kind)
@ -2847,7 +2855,10 @@ static char* qc_sqlite_get_prepare_name(GWBUF* query)
{ {
if (qc_info_is_valid(info->status)) if (qc_info_is_valid(info->status))
{ {
MXS_WARNING("qc_get_prepare_name not implemented yet."); if (info->prepare_name)
{
name = MXS_STRDUP(info->prepare_name);
}
} }
else if (MXS_LOG_PRIORITY_IS_ENABLED(LOG_INFO)) else if (MXS_LOG_PRIORITY_IS_ENABLED(LOG_INFO))
{ {