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

Rename query classifier functions consistently.

Browse Source 
All public query classifier functions now have the prefix qc_.
This commit is contained in:
Johan Wikman
2016-01-11 10:58:39 +02:00
parent ec281849aa
commit 2f42246880
10 changed files with 58 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
server/modules/filter/dbfwfilter.c
View File

@ -1610,8 +1610,8 @@ bool rule_matches(FW_INSTANCE* my_instance,
if (is_sql)
{
optype = query_classifier_get_operation(queue);
is_real = skygw_is_real_query(queue);
optype = qc_get_operation(queue);
is_real = qc_is_real_query(queue);
}
if (rulelist->rule->on_queries == QUERY_OP_UNDEFINED || rulelist->rule->on_queries & optype)
@ -1660,7 +1660,7 @@ bool rule_matches(FW_INSTANCE* my_instance,
case RT_COLUMN:
if (is_sql && is_real)
{
where = skygw_get_affected_fields(queue);
where = qc_get_affected_fields(queue);
if (where != NULL)
{
char* saveptr;
@ -1700,7 +1700,7 @@ bool rule_matches(FW_INSTANCE* my_instance,
if (is_sql && is_real)
{
char * strptr;
where = skygw_get_affected_fields(queue);
where = qc_get_affected_fields(queue);
if (where != NULL)
{
@ -1809,7 +1809,7 @@ bool rule_matches(FW_INSTANCE* my_instance,
case RT_CLAUSE:
if (is_sql && is_real &&
!skygw_query_has_clause(queue))
!qc_query_has_clause(queue))
{
matches = true;
msg = strdup("Required WHERE/HAVING clause is missing.");

8
server/modules/filter/mqfilter.c
View File

@ -1129,7 +1129,7 @@ routeQuery(FILTER *instance, void *session, GWBUF *queue)
if (!my_instance->log_all)
{
if (!skygw_is_real_query(queue))
if (!qc_is_real_query(queue))
{
goto send_downstream;
}
@ -1200,7 +1200,7 @@ routeQuery(FILTER *instance, void *session, GWBUF *queue)
if (my_instance->trgtype & TRG_SCHEMA && my_instance->shm_trg)
{
int tbsz = 0, z;
char** tblnames = skygw_get_table_names(queue, &tbsz, true);
char** tblnames = qc_get_table_names(queue, &tbsz, true);
char* tmp;
bool all_remotes = true;
@ -1267,7 +1267,7 @@ routeQuery(FILTER *instance, void *session, GWBUF *queue)
if (my_instance->trgtype & TRG_OBJECT && my_instance->obj_trg)
{
sesstbls = skygw_get_table_names(queue, &dbcount, false);
sesstbls = qc_get_table_names(queue, &dbcount, false);
for (j = 0; j < dbcount; j++)
{
@ -1384,7 +1384,7 @@ validate_triggers:
{
/**Try to convert to a canonical form and use the plain query if unsuccessful*/
if ((canon_q = skygw_get_canonical(queue)) == NULL)
if ((canon_q = qc_get_canonical(queue)) == NULL)
{
MXS_ERROR("Cannot form canonical query.");
}

18
server/modules/routing/readwritesplit/readwritesplit.c
View File

@ -1607,9 +1607,9 @@ void check_drop_tmp_table(
dbname = (char*)data->db;
if (is_drop_table_query(querybuf))
if (qc_is_drop_table_query(querybuf))
{
tbl = skygw_get_table_names(querybuf,&tsize,false);
tbl = qc_get_table_names(querybuf,&tsize,false);
if(tbl != NULL){
for(i = 0; i<tsize; i++)
{
@ -1703,7 +1703,7 @@ static skygw_query_type_t is_read_tmp_table(
QUERY_IS_TYPE(qtype, QUERY_TYPE_SYSVAR_READ) ||
QUERY_IS_TYPE(qtype, QUERY_TYPE_GSYSVAR_READ))
{
tbl = skygw_get_table_names(querybuf,&tsize,false);
tbl = qc_get_table_names(querybuf,&tsize,false);
if (tbl != NULL && tsize > 0)
{
@ -1808,7 +1808,7 @@ static void check_create_tmp_table(
bool is_temp = true;
char* tblname = NULL;
tblname = skygw_get_created_table_name(querybuf);
tblname = qc_get_created_table_name(querybuf);
if (tblname && strlen(tblname) > 0)
{
@ -2145,11 +2145,11 @@ static bool route_single_stmt(
break;
case MYSQL_COM_QUERY:
qtype = query_classifier_get_type(querybuf);
qtype = qc_get_type(querybuf);
break;
case MYSQL_COM_STMT_PREPARE:
qtype = query_classifier_get_type(querybuf);
qtype = qc_get_type(querybuf);
qtype |= QUERY_TYPE_PREPARE_STMT;
break;
@ -2195,7 +2195,7 @@ static bool route_single_stmt(
*/
if (!rses->rses_load_active)
{
skygw_query_op_t queryop = query_classifier_get_operation(querybuf);
skygw_query_op_t queryop = qc_get_operation(querybuf);
if (queryop == QUERY_OP_LOAD)
{
rses->rses_load_active = true;
@ -2255,7 +2255,7 @@ static bool route_single_stmt(
MYSQL_GET_PACKET_LEN((unsigned char *)querybuf->start) - 1);
char* data = (char*) &packet[5];
char* contentstr = strndup(data, MIN(len, RWSPLIT_TRACE_MSG_LEN));
char* qtypestr = skygw_get_qtype_str(qtype);
char* qtypestr = qc_get_qtype_str(qtype);
MXS_INFO("> Autocommit: %s, trx is %s, cmd: %s, type: %s, "
"stmt: %s%s %s",
@ -2308,7 +2308,7 @@ static bool route_single_stmt(
backend_ref_t* bref = rses->rses_backend_ref;
char* query_str = modutil_get_query(querybuf);
char* qtype_str = skygw_get_qtype_str(qtype);
char* qtype_str = qc_get_qtype_str(qtype);
MXS_ERROR("Can't route %s:%s:\"%s\". SELECT with "
"session data modification is not supported "

18
server/modules/routing/schemarouter/schemarouter.c
View File

@ -522,7 +522,7 @@ char* get_shard_target_name(ROUTER_INSTANCE* router, ROUTER_CLIENT_SES* client,
char* rval = NULL,*query, *tmp = NULL;
bool has_dbs = false; /**If the query targets any database other than the current one*/
dbnms = skygw_get_database_names(buffer,&sz);
dbnms = qc_get_database_names(buffer,&sz);
HASHTABLE* ht = client->shardmap->hash;
@ -1537,9 +1537,9 @@ ROUTER* instance,
rses_prop_tmp = router_cli_ses->rses_properties[RSES_PROP_TYPE_TMPTABLES];
dbname = router_cli_ses->current_db;
if (is_drop_table_query(querybuf))
if (qc_is_drop_table_query(querybuf))
{
tbl = skygw_get_table_names(querybuf,&tsize,false);
tbl = qc_get_table_names(querybuf,&tsize,false);
if(tbl != NULL){
for(i = 0; i<tsize; i++)
{
@ -1600,7 +1600,7 @@ ROUTER* instance,
QUERY_IS_TYPE(qtype, QUERY_TYPE_SYSVAR_READ) ||
QUERY_IS_TYPE(qtype, QUERY_TYPE_GSYSVAR_READ))
{
tbl = skygw_get_table_names(querybuf,&tsize,false);
tbl = qc_get_table_names(querybuf,&tsize,false);
if (tbl != NULL && tsize > 0)
{
@ -1677,7 +1677,7 @@ void check_create_tmp_table(
bool is_temp = true;
char* tblname = NULL;
tblname = skygw_get_created_table_name(querybuf);
tblname = qc_get_created_table_name(querybuf);
if (tblname && strlen(tblname) > 0)
{
@ -2014,11 +2014,11 @@ static int routeQuery(
break;
case MYSQL_COM_QUERY:
qtype = query_classifier_get_type(querybuf);
qtype = qc_get_type(querybuf);
break;
case MYSQL_COM_STMT_PREPARE:
qtype = query_classifier_get_type(querybuf);
qtype = qc_get_type(querybuf);
qtype |= QUERY_TYPE_PREPARE_STMT;
break;
@ -2048,7 +2048,7 @@ static int routeQuery(
MYSQL_GET_PACKET_LEN((unsigned char *)querybuf->start)-1);
char* data = (char*)&packet[5];
char* contentstr = strndup(data, len);
char* qtypestr = skygw_get_qtype_str(qtype);
char* qtypestr = qc_get_qtype_str(qtype);
MXS_INFO("> Cmd: %s, type: %s, "
"stmt: %s%s %s",
@ -2066,7 +2066,7 @@ static int routeQuery(
* all of them.
*/
skygw_query_op_t op = query_classifier_get_operation(querybuf);
skygw_query_op_t op = qc_get_operation(querybuf);
if (packet_type == MYSQL_COM_INIT_DB ||
op == QUERY_OP_CHANGE_DB)

2
server/modules/routing/schemarouter/sharding_common.c
View File

@ -35,7 +35,7 @@ bool extract_database(GWBUF* buf, char* str)
plen = gw_mysql_get_byte3(packet) - 1;
/** Copy database name from MySQL packet to session */
if(query_classifier_get_operation(buf) == QUERY_OP_CHANGE_DB)
if(qc_get_operation(buf) == QUERY_OP_CHANGE_DB)
{
query = modutil_get_SQL(buf);
tok = strtok_r(query," ;",&saved);

6
server/modules/routing/schemarouter/shardrouter.c
View File

@ -447,7 +447,7 @@ get_shard_target_name(ROUTER_INSTANCE* router, ROUTER_CLIENT_SES* client, GWBUF*
char *query = NULL,*tmp = NULL;
bool has_dbs = false; /**If the query targets any database other than the current one*/
dbnms = skygw_get_database_names(buffer, &sz);
dbnms = qc_get_database_names(buffer, &sz);
if(sz > 0)
{
@ -1607,11 +1607,11 @@ routeQuery(ROUTER* instance,
break;
case MYSQL_COM_QUERY:
qtype = query_classifier_get_type(querybuf);
qtype = qc_get_type(querybuf);
break;
case MYSQL_COM_STMT_PREPARE:
qtype = query_classifier_get_type(querybuf);
qtype = qc_get_type(querybuf);
qtype |= QUERY_TYPE_PREPARE_STMT;
break;