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

query_classifier.cc:skygw_get_canonical: if the item to be replaced is an empty string "", it is processed differently from the other cases due to difficulties to get wanted result by adding special rule for that to regex.

Browse Source 
query_classifier.h: added parsing information structure to query classifier away from buffer.h.
buffer.c:introduced a buffer object which includes object pointer and a clean-up call-back function. Buffer objects form a list which is cleaned up by the last referrer of the buffer, as a part of gwbuf_free. Buffer object list is protected by a spinlock gwbuf_lock.
	Also added identifier type, bufobj_id_t which is enumerated type and currently includes one value only, GWBUF_PARSING_INFO. Added also a bitfield for information about the buffer. It currently has one type only, GWBUF_INFO_PARSED indicating that buffer content is parsed and there is buffer object of type GWBUF_PARSING_INFO.
skygw_utils.cc:replace_literal:changed regexec matching to case insensitive because user-defined literals are sometimes converted to upper-case ones.
This commit is contained in:
VilhoRaatikka
2014-08-22 19:01:56 +03:00
parent 3bc88e4eb9
commit ee52ac64a9
5 changed files with 208 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
query_classifier/query_classifier.cc
View File

@ -105,20 +105,29 @@ skygw_query_type_t query_classifier_get_type(
ss_info_dassert(querybuf != NULL, ("querybuf is NULL"));
/** Create parsing info for the query and store it to buffer */
if (!query_is_parsed(querybuf))
succp = query_is_parsed(querybuf);
if (!succp)
{
succp = parse_query(querybuf);
}
/** Read thd pointer and resolve the query type with it. */
if (succp)
{
parsing_info_t* pi = (parsing_info_t*)gwbuf_get_parsing_info(querybuf);
mysql = (MYSQL *)pi->pi_handle;
/** Find out the query type */
if (mysql != NULL)
parsing_info_t* pi;
pi = (parsing_info_t*)gwbuf_get_buffer_object_data(querybuf,
GWBUF_PARSING_INFO);
if (pi != NULL)
{
qtype = resolve_query_type((THD *)mysql->thd);
mysql = (MYSQL *)pi->pi_handle;
/** Find out the query type */
if (mysql != NULL)
{
qtype = resolve_query_type((THD *)mysql->thd);
}
}
}
return qtype;
@ -143,19 +152,21 @@ bool parse_query (
parsing_info_t* pi;
CHK_GWBUF(querybuf);
/** Do not parse without releasing previous parse info first */
ss_dassert(!query_is_parsed(querybuf));
if (querybuf->gwbuf_parsing_info == NULL)
if (query_is_parsed(querybuf))
{
/** Create parsing info */
querybuf->gwbuf_parsing_info = parsing_info_init(parsing_info_done);
return false;
}
/** Create parsing info */
pi = parsing_info_init(parsing_info_done);
if (querybuf->gwbuf_parsing_info == NULL)
if (pi == NULL)
{
succp = false;
goto retblock;
}
}
/** Extract query and copy it to different buffer */
data = (uint8_t*)GWBUF_DATA(querybuf);
len = MYSQL_GET_PACKET_LEN(data)-1; /*< distract 1 for packet type byte */
@ -163,21 +174,22 @@ bool parse_query (
if (query_str == NULL)
{
/** Free parsing info data */
parsing_info_done(pi);
succp = false;
goto retblock;
}
memcpy(query_str, &data[5], len);
memset(&query_str[len], 0, 1);
parsing_info_set_plain_str(querybuf->gwbuf_parsing_info, query_str);
parsing_info_set_plain_str(pi, query_str);
/** Get one or create new THD object to be use in parsing */
pi = (parsing_info_t *)querybuf->gwbuf_parsing_info;
thd = get_or_create_thd_for_parsing((MYSQL *)pi->pi_handle, query_str);
if (thd == NULL)
{
parsing_info_done(querybuf->gwbuf_parsing_info);
querybuf->gwbuf_parsing_info = NULL;
/** Free parsing info data */
parsing_info_done(pi);
succp = false;
goto retblock;
}
@ -186,6 +198,12 @@ bool parse_query (
* thd and lex are readable even if creating parse tree fails.
*/
create_parse_tree(thd);
/** Add complete parsing info struct to the query buffer */
gwbuf_add_buffer_object(querybuf,
GWBUF_PARSING_INFO,
(void *)pi,
parsing_info_done);
succp = true;
retblock:
return succp;
@ -203,11 +221,8 @@ retblock:
bool query_is_parsed(
GWBUF* buf)
{
if (buf->gwbuf_parsing_info != NULL)
{
return true;
}
return false;
CHK_GWBUF(buf);
return GWBUF_IS_PARSED(buf);
}
@ -859,23 +874,29 @@ char* skygw_get_canonical(
MYSQL* mysql;
THD* thd;
LEX* lex;
bool found = false;
Item* item;
char* querystr;
if (querybuf->gwbuf_parsing_info == NULL)
if (!GWBUF_IS_PARSED(querybuf))
{
querystr = NULL;
goto retblock;
}
pi = (parsing_info_t*)querybuf->gwbuf_parsing_info;
}
pi = (parsing_info_t *)gwbuf_get_buffer_object_data(querybuf,
GWBUF_PARSING_INFO);
if (pi == NULL)
{
querystr = NULL;
goto retblock;
}
if (pi->pi_query_plain_str == NULL ||
(mysql = (MYSQL *)pi->pi_handle) == NULL ||
(thd = (THD *)mysql->thd) == NULL ||
(lex = thd->lex) == NULL)
{
ss_dassert(querystr != NULL &&
ss_dassert(pi->pi_query_plain_str != NULL &&
mysql != NULL &&
thd != NULL &&
lex != NULL);
@ -899,7 +920,14 @@ char* skygw_get_canonical(
itype == Item::VARBIN_ITEM ||
itype == Item::NULL_ITEM))
{
querystr = replace_literal(querystr, item->name, "?");
if (itype == Item::STRING_ITEM && strlen(item->name) == 0)
{
querystr = replace_literal(querystr, "\"\"", "\"?\"");
}
else
{
querystr = replace_literal(querystr, item->name, "?");
}
}
} /*< for */
retblock:

18
query_classifier/query_classifier.h
View File

@ -47,6 +47,20 @@ typedef enum {
QUERY_TYPE_EXEC_STMT = 0x1000 /*< Execute prepared statement */
} skygw_query_type_t;
typedef struct parsing_info_st {
#if defined(SS_DEBUG)
skygw_chk_t pi_chk_top;
#endif
void* pi_handle; /*< parsing info object pointer */
char* pi_query_plain_str; /*< query as plain string */
void (*pi_done_fp)(void *); /*< clean-up function for parsing info */
#if defined(SS_DEBUG)
skygw_chk_t pi_chk_tail;
#endif
} parsing_info_t;
#define QUERY_IS_TYPE(mask,type) ((mask & type) == type)
/**
@ -61,9 +75,7 @@ char* skygw_get_canonical(GWBUF* querybuf);
bool parse_query (GWBUF* querybuf);
parsing_info_t* parsing_info_init(void (*donefun)(void *));
void parsing_info_done(void* ptr);
bool query_is_parsed(GWBUF* buf);
bool query_is_parsed(GWBUF* buf);
EXTERN_C_BLOCK_END