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

MXS-1196: qc_mysqlembedded will not always claim a stmt was parsed

Browse Source 
When developing the oracle related parser extensions, it makes
things simpler if also qc_mysqlembedded properly reports when
it cannot parse a statement.

Note, although this change is marked for 2.1, it will not be
merged into the first 2.1 GA release.
This commit is contained in:
Johan Wikman
2017-04-25 13:00:16 +03:00
parent 43ab0f036e
commit b191e6ecda
1 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
query_classifier/qc_mysqlembedded/qc_mysqlembedded.cc
View File

@ -89,6 +89,7 @@ typedef struct parsing_info_st
size_t function_infos_len; size_t function_infos_len;
size_t function_infos_capacity; size_t function_infos_capacity;
GWBUF* preparable_stmt; GWBUF* preparable_stmt;
qc_parse_result_t result;
#if defined(SS_DEBUG) #if defined(SS_DEBUG)
skygw_chk_t pi_chk_tail; skygw_chk_t pi_chk_tail;
#endif #endif
@ -148,7 +149,11 @@ int32_t qc_mysql_parse(GWBUF* querybuf, uint32_t collect, int32_t* result)
if (parsed) if (parsed)
{ {
*result = QC_QUERY_PARSED; parsing_info_t* pi = (parsing_info_t*) gwbuf_get_buffer_object_data(querybuf,
GWBUF_PARSING_INFO);
ss_dassert(pi);
*result = pi->result;
} }
else else
{ {
@ -270,7 +275,11 @@ static bool parse_query(GWBUF* querybuf)
* Create parse_tree inside thd. * Create parse_tree inside thd.
* thd and lex are readable even if creating parse tree fails. * thd and lex are readable even if creating parse tree fails.
*/ */
create_parse_tree(thd); if (create_parse_tree(thd))
{
pi->result = QC_QUERY_PARSED;
}
/** Add complete parsing info struct to the query buffer */ /** Add complete parsing info struct to the query buffer */
gwbuf_add_buffer_object(querybuf, gwbuf_add_buffer_object(querybuf,
GWBUF_PARSING_INFO, GWBUF_PARSING_INFO,
@ -454,7 +463,7 @@ static bool create_parse_tree(THD* thd)
} }
return_here: return_here:
return failp; return !failp;
} }
/** /**
@ -833,6 +842,10 @@ static uint32_t resolve_query_type(parsing_info_t *pi, THD* thd)
goto return_qtype; goto return_qtype;
break; break;
case SQLCOM_END:
goto return_qtype;
break;
default: default:
type |= QUERY_TYPE_WRITE; type |= QUERY_TYPE_WRITE;
break; break;
@ -1546,6 +1559,7 @@ static parsing_info_t* parsing_info_init(void (*donefun)(void *))
/** Set handle and free function to parsing info struct */ /** Set handle and free function to parsing info struct */
pi->pi_handle = mysql; pi->pi_handle = mysql;
pi->pi_done_fp = donefun; pi->pi_done_fp = donefun;
pi->result = QC_QUERY_INVALID;
retblock: retblock:
return pi; return pi;