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

Replace skygw_ type prefix with qc_.

Browse Source 
- skygw_query_type_t renamed to qc_query_type_t.
- skygw_query_op_t renamed to qc_query_op_t.
This commit is contained in:
Johan Wikman
2016-01-11 11:22:38 +02:00
parent 2f42246880
commit 23a7562d3a
7 changed files with 73 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
query_classifier/query_classifier.cc
View File

@ -66,7 +66,7 @@
static THD* get_or_create_thd_for_parsing(MYSQL* mysql, char* query_str);
static unsigned long set_client_flags(MYSQL* mysql);
static bool create_parse_tree(THD* thd);
static skygw_query_type_t resolve_query_type(THD* thd);
static qc_query_type_t resolve_query_type(THD* thd);
static bool skygw_stmt_causes_implicit_commit(LEX* lex, int* autocommit_stmt);
static int is_autocommit_stmt(LEX* lex);
@ -108,10 +108,10 @@ bool ensure_query_is_parsed(GWBUF* query)
*
* @return query type
*/
skygw_query_type_t qc_get_type(GWBUF* querybuf)
qc_query_type_t qc_get_type(GWBUF* querybuf)
{
MYSQL* mysql;
skygw_query_type_t qtype = QUERY_TYPE_UNKNOWN;
qc_query_type_t qtype = QUERY_TYPE_UNKNOWN;
bool succp;
ss_info_dassert(querybuf != NULL, ("querybuf is NULL"));
@ -416,9 +416,9 @@ return_here:
* the resulting type may be different.
*
*/
static skygw_query_type_t resolve_query_type(THD* thd)
static qc_query_type_t resolve_query_type(THD* thd)
{
skygw_query_type_t qtype = QUERY_TYPE_UNKNOWN;
qc_query_type_t qtype = QUERY_TYPE_UNKNOWN;
u_int32_t type = QUERY_TYPE_UNKNOWN;
int set_autocommit_stmt = -1; /*< -1 no, 0 disable, 1 enable */
LEX* lex;
@ -826,7 +826,7 @@ static skygw_query_type_t resolve_query_type(THD* thd)
} /**< if */
return_qtype:
qtype = (skygw_query_type_t) type;
qtype = (qc_query_type_t) type;
return qtype;
}
@ -1641,11 +1641,11 @@ static void parsing_info_set_plain_str(void* ptr, char* str)
*
* @return string representing the query type value
*/
char* qc_get_qtype_str(skygw_query_type_t qtype)
char* qc_get_qtype_str(qc_query_type_t qtype)
{
int t1 = (int) qtype;
int t2 = 1;
skygw_query_type_t t = QUERY_TYPE_UNKNOWN;
qc_query_type_t t = QUERY_TYPE_UNKNOWN;
char* qtype_str = NULL;
/**
@ -1656,7 +1656,7 @@ char* qc_get_qtype_str(skygw_query_type_t qtype)
{
if (t1 & t2)
{
t = (skygw_query_type_t) t2;
t = (qc_query_type_t) t2;
if (qtype_str == NULL)
{
@ -1751,9 +1751,9 @@ retblock:
return databases;
}
skygw_query_op_t qc_get_operation(GWBUF* querybuf)
qc_query_op_t qc_get_operation(GWBUF* querybuf)
{
skygw_query_op_t operation = QUERY_OP_UNDEFINED;
qc_query_op_t operation = QUERY_OP_UNDEFINED;
if (querybuf)
{

10
query_classifier/query_classifier.h
View File

@ -61,7 +61,7 @@ typedef enum
QUERY_TYPE_READ_TMP_TABLE = 0x100000, /*< Read temporary table:master (could be any) */
QUERY_TYPE_SHOW_DATABASES = 0x200000, /*< Show list of databases */
QUERY_TYPE_SHOW_TABLES = 0x400000 /*< Show list of tables */
} skygw_query_type_t;
} qc_query_type_t;
typedef enum
{
@ -79,7 +79,7 @@ typedef enum
QUERY_OP_DROP_INDEX = (1 << 10),
QUERY_OP_CHANGE_DB = (1 << 11),
QUERY_OP_LOAD = (1 << 12)
} skygw_query_op_t;
} qc_query_op_t;
typedef struct parsing_info_st
{
@ -101,8 +101,8 @@ typedef struct parsing_info_st
* Create THD and use it for creating parse tree. Examine parse tree and
* classify the query.
*/
skygw_query_type_t qc_get_type(GWBUF* querybuf);
skygw_query_op_t qc_get_operation(GWBUF* querybuf);
qc_query_type_t qc_get_type(GWBUF* querybuf);
qc_query_op_t qc_get_operation(GWBUF* querybuf);
#if defined(NOT_USED)
char* qc_get_stmtname(GWBUF* buf);
@ -114,7 +114,7 @@ bool qc_is_real_query(GWBUF* querybuf);
char** qc_get_table_names(GWBUF* querybuf, int* tblsize, bool fullnames);
char* qc_get_canonical(GWBUF* querybuf);
bool qc_query_has_clause(GWBUF* buf);
char* qc_get_qtype_str(skygw_query_type_t qtype);
char* qc_get_qtype_str(qc_query_type_t qtype);
char* qc_get_affected_fields(GWBUF* buf);
char** qc_get_database_names(GWBUF* querybuf, int* size);

2
query_classifier/test/classify.c
View File

@ -108,7 +108,7 @@ int main(int argc, char** argv)
memmove(strbuff,tok + 1, strsz - qlen);
strsz -= qlen;
memset(strbuff + strsz,0,buffsz - strsz);
skygw_query_type_t type = qc_get_type(buff);
qc_query_type_t type = qc_get_type(buff);
char qtypestr[64];
char expbuff[256];
int expos = 0;