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

Rename qc_get_type() to qc_get_type_mask()

Browse Source 
To make it plain that it is a mask that is returned and not a
specific value from the enum qc_query_type_t.
This commit is contained in:
Johan Wikman
2017-01-17 16:38:17 +02:00
parent 86c97a2109
commit 16a76fcd28
13 changed files with 132 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
query_classifier/test/classify.c
View File

@ -208,7 +208,7 @@ int test(FILE* input, FILE* expected)
memmove(strbuff, tok + 1, strsz - qlen);
strsz -= qlen;
memset(strbuff + strsz, 0, buffsz - strsz);
qc_query_type_t type = qc_get_type(buff);
qc_query_type_t type = qc_get_type_mask(buff);
char expbuff[256];
int expos = 0;

10
query_classifier/test/compare.cc
View File

@ -354,12 +354,12 @@ bool compare_get_type(QUERY_CLASSIFIER* pClassifier1, GWBUF* pCopy1,
QUERY_CLASSIFIER* pClassifier2, GWBUF* pCopy2)
{
bool success = false;
const char HEADING[] = "qc_get_type : ";
const char HEADING[] = "qc_get_type_mask : ";
uint32_t rv1;
pClassifier1->qc_get_type(pCopy1, &rv1);
pClassifier1->qc_get_type_mask(pCopy1, &rv1);
uint32_t rv2;
pClassifier2->qc_get_type(pCopy2, &rv2);
pClassifier2->qc_get_type_mask(pCopy2, &rv2);
stringstream ss;
ss << HEADING;
@ -1186,10 +1186,10 @@ bool compare(QUERY_CLASSIFIER* pClassifier1, GWBUF* pBuf1,
bool success = (errors == 0);
uint32_t type_mask1;
pClassifier1->qc_get_type(pBuf1, &type_mask1);
pClassifier1->qc_get_type_mask(pBuf1, &type_mask1);
uint32_t type_mask2;
pClassifier2->qc_get_type(pBuf2, &type_mask2);
pClassifier2->qc_get_type_mask(pBuf2, &type_mask2);
if ((type_mask1 == type_mask2) &&
((type_mask1 & QUERY_TYPE_PREPARE_NAMED_STMT) || (type_mask1 & QUERY_TYPE_PREPARE_STMT)))