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

qc_sqlite: Copy preparable statement

Browse Source 
Peeking into the token does not always work.
This commit is contained in:
Johan Wikman
2016-10-31 19:11:39 +02:00
parent c0e29691e0
commit f7c3150462
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
query_classifier/qc_sqlite/qc_sqlite.c
View File

@ -80,7 +80,7 @@ typedef struct qc_sqlite_info
int keyword_2; // The second encountered keyword. int keyword_2; // The second encountered keyword.
char* prepare_name; // The name of a prepared statement. char* prepare_name; // The name of a prepared statement.
qc_query_op_t prepare_operation; // The operation of a prepared statement. qc_query_op_t prepare_operation; // The operation of a prepared statement.
size_t preparable_stmt_offset; // The start of the preparable statement. char* preparable_stmt; // The preparable statement.
size_t preparable_stmt_length; // The length of the preparable statement. size_t preparable_stmt_length; // The length of the preparable statement.
} QC_SQLITE_INFO; } QC_SQLITE_INFO;
@ -294,6 +294,8 @@ static void info_finish(QC_SQLITE_INFO* info)
free_string_array(info->table_fullnames); free_string_array(info->table_fullnames);
free(info->created_table_name); free(info->created_table_name);
free_string_array(info->database_names); free_string_array(info->database_names);
free(info->prepare_name);
free(info->preparable_stmt);
} }
static void info_free(QC_SQLITE_INFO* info) static void info_free(QC_SQLITE_INFO* info)
@ -333,7 +335,7 @@ static QC_SQLITE_INFO* info_init(QC_SQLITE_INFO* info)
info->keyword_2 = 0; // that we have not seen a keyword. info->keyword_2 = 0; // that we have not seen a keyword.
info->prepare_name = NULL; info->prepare_name = NULL;
info->prepare_operation = QUERY_OP_UNDEFINED; info->prepare_operation = QUERY_OP_UNDEFINED;
info->preparable_stmt_offset = 0; info->preparable_stmt = NULL;
info->preparable_stmt_length = 0; info->preparable_stmt_length = 0;
return info; return info;
@ -467,7 +469,7 @@ static bool parse_query(GWBUF* query)
this_thread.info->query = NULL; this_thread.info->query = NULL;
this_thread.info->query_len = 0; this_thread.info->query_len = 0;
if (info->types & QUERY_TYPE_PREPARE_NAMED_STMT) if ((info->types & QUERY_TYPE_PREPARE_NAMED_STMT) && info->preparable_stmt)
{ {
QC_SQLITE_INFO* preparable_info = info_alloc(); QC_SQLITE_INFO* preparable_info = info_alloc();
@ -475,7 +477,7 @@ static bool parse_query(GWBUF* query)
{ {
this_thread.info = preparable_info; this_thread.info = preparable_info;
const char *preparable_s = s + info->preparable_stmt_offset; const char *preparable_s = info->preparable_stmt;
size_t preparable_len = info->preparable_stmt_length; size_t preparable_len = info->preparable_stmt_length;
this_thread.info->query = preparable_s; this_thread.info->query = preparable_s;
@ -2014,11 +2016,12 @@ void maxscalePrepare(Parse* pParse, Token* pName, Token* pStmt)
info->prepare_name[pName->n] = 0; info->prepare_name[pName->n] = 0;
} }
// We store the position of the preparable statement inside the original info->preparable_stmt_length = pStmt->n - 2;
// statement. That will allow us to later create a new GWBUF of the info->preparable_stmt = MXS_MALLOC(info->preparable_stmt_length);
// parsable statment and parse that. if (info->preparable_stmt)
info->preparable_stmt_offset = pParse->sLastToken.z - pParse->zTail + 1; // Ignore starting quote. {
info->preparable_stmt_length = pStmt->n - 2; // Remove starting and ending quotes. memcpy(info->preparable_stmt, pStmt->z + 1, pStmt->n - 2);
}
} }
void maxscalePrivileges(Parse* pParse, int kind) void maxscalePrivileges(Parse* pParse, int kind)