xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

[td-98] update macro

This commit is contained in:
hjxilinx 2020-04-10 23:16:56 +08:00
parent 3f9d5ccaa4
commit 4241da56e1
2 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/query/tests/astTest.cpp
View File

@ -255,7 +255,7 @@ static void testQueryStr(SSchema *schema, int32_t numOfCols, char *sql, tSkipLis
printf("expr is: %s\n", str); printf("expr is: %s\n", str);
SArray *result = NULL; SArray *result = NULL;
// tSQLBinaryExprTraverse(pExpr, pSkipList, result, tSkipListNodeFilterCallback, &result); // tExprTreeTraverse(pExpr, pSkipList, result, tSkipListNodeFilterCallback, &result);
// printf("the result is:%lld\n", result.num); // printf("the result is:%lld\n", result.num);
// //
// bool findResult = false; // bool findResult = false;
@ -533,7 +533,7 @@ tExprNode* createExpr2() {
auto *p2 = (tExprNode*) calloc(1, sizeof(tExprNode)); auto *p2 = (tExprNode*) calloc(1, sizeof(tExprNode));
p2->nodeType = TSQL_NODE_EXPR; p2->nodeType = TSQL_NODE_EXPR;
p2->_node.optr = TSDB_RELATION_LARGE_EQUAL; p2->_node.optr = TSDB_RELATION_GREATER_EQUAL;
p2->_node.pLeft = pLeft1; p2->_node.pLeft = pLeft1;
p2->_node.pRight = pRight1; p2->_node.pRight = pRight1;
p2->_node.hasPK = false; p2->_node.hasPK = false;
@ -556,7 +556,8 @@ void exprSerializeTest1() {
ASSERT_TRUE(size > 0); ASSERT_TRUE(size > 0);
char* b = tbufGetData(&buf, false); char* b = tbufGetData(&buf, false);
tExprNode* p2 = exprTreeFromBinary(b, size); tExprNode* p2 = NULL;
exprTreeFromBinary(b, size, &p2);
ASSERT_EQ(p1->nodeType, p2->nodeType); ASSERT_EQ(p1->nodeType, p2->nodeType);
ASSERT_EQ(p2->_node.optr, p1->_node.optr); ASSERT_EQ(p2->_node.optr, p1->_node.optr);
@ -592,7 +593,8 @@ void exprSerializeTest2() {
ASSERT_TRUE(size > 0); ASSERT_TRUE(size > 0);
char* b = tbufGetData(&buf, false); char* b = tbufGetData(&buf, false);
tExprNode* p2 = exprTreeFromBinary(b, size); tExprNode* p2 = NULL;
exprTreeFromBinary(b, size, &p2);
ASSERT_EQ(p1->nodeType, p2->nodeType); ASSERT_EQ(p1->nodeType, p2->nodeType);
ASSERT_EQ(p2->_node.optr, p1->_node.optr); ASSERT_EQ(p2->_node.optr, p1->_node.optr);
@ -617,7 +619,7 @@ void exprSerializeTest2() {
ASSERT_EQ(c1Right->nodeType, c2Right->nodeType); ASSERT_EQ(c1Right->nodeType, c2Right->nodeType);
ASSERT_EQ(c2Right->nodeType, TSQL_NODE_EXPR); ASSERT_EQ(c2Right->nodeType, TSQL_NODE_EXPR);
ASSERT_EQ(c2Right->_node.optr, TSDB_RELATION_LARGE_EQUAL); ASSERT_EQ(c2Right->_node.optr, TSDB_RELATION_GREATER_EQUAL);
ASSERT_EQ(c2Right->_node.pRight->pVal->dKey, 91.99); ASSERT_EQ(c2Right->_node.pRight->pVal->dKey, 91.99);
ASSERT_EQ(p2->_node.hasPK, true); ASSERT_EQ(p2->_node.hasPK, true);

18
src/query/tests/tsBufTest.cpp
View File

@ -37,7 +37,7 @@ void simpleTest() {
int64_t* list = createTsList(10, 10000000, 30); int64_t* list = createTsList(10, 10000000, 30);
tsBufAppend(pTSBuf, 0, tag, (const char*)list, num * sizeof(int64_t)); tsBufAppend(pTSBuf, 0, tag, (const char*)list, num * sizeof(int64_t));
EXPECT_EQ(pTSBuf->tsOrder, TSQL_SO_ASC); EXPECT_EQ(pTSBuf->tsOrder, TSDB_ORDER_ASC);
EXPECT_EQ(pTSBuf->tsData.len, sizeof(int64_t) * num); EXPECT_EQ(pTSBuf->tsData.len, sizeof(int64_t) * num);
EXPECT_EQ(pTSBuf->block.tag, tag); EXPECT_EQ(pTSBuf->block.tag, tag);
@ -65,7 +65,7 @@ void largeTSTest() {
EXPECT_EQ(pTSBuf->tsData.len, 0); EXPECT_EQ(pTSBuf->tsData.len, 0);
EXPECT_EQ(pTSBuf->block.tag, tag); EXPECT_EQ(pTSBuf->block.tag, tag);
EXPECT_EQ(pTSBuf->numOfVnodes, 1); EXPECT_EQ(pTSBuf->numOfVnodes, 1);
EXPECT_EQ(pTSBuf->tsOrder, TSQL_SO_ASC); EXPECT_EQ(pTSBuf->tsOrder, TSDB_ORDER_ASC);
tsBufFlush(pTSBuf); tsBufFlush(pTSBuf);
EXPECT_EQ(pTSBuf->tsData.len, 0); EXPECT_EQ(pTSBuf->tsData.len, 0);
@ -91,7 +91,7 @@ void multiTagsTest() {
start += step * num; start += step * num;
} }
EXPECT_EQ(pTSBuf->tsOrder, TSQL_SO_ASC); EXPECT_EQ(pTSBuf->tsOrder, TSDB_ORDER_ASC);
EXPECT_EQ(pTSBuf->tsData.len, num * sizeof(int64_t)); EXPECT_EQ(pTSBuf->tsData.len, num * sizeof(int64_t));
EXPECT_EQ(pTSBuf->block.tag, numOfTags - 1); EXPECT_EQ(pTSBuf->block.tag, numOfTags - 1);
@ -127,7 +127,7 @@ void multiVnodeTagsTest() {
EXPECT_EQ(pTSBuf->numOfVnodes, j + 1); EXPECT_EQ(pTSBuf->numOfVnodes, j + 1);
} }
EXPECT_EQ(pTSBuf->tsOrder, TSQL_SO_ASC); EXPECT_EQ(pTSBuf->tsOrder, TSDB_ORDER_ASC);
EXPECT_EQ(pTSBuf->tsData.len, num * sizeof(int64_t)); EXPECT_EQ(pTSBuf->tsData.len, num * sizeof(int64_t));
EXPECT_EQ(pTSBuf->block.tag, numOfTags - 1); EXPECT_EQ(pTSBuf->block.tag, numOfTags - 1);
@ -167,7 +167,7 @@ void loadDataTest() {
EXPECT_EQ(pTSBuf->numOfVnodes, j + 1); EXPECT_EQ(pTSBuf->numOfVnodes, j + 1);
} }
EXPECT_EQ(pTSBuf->tsOrder, TSQL_SO_ASC); EXPECT_EQ(pTSBuf->tsOrder, TSDB_ORDER_ASC);
EXPECT_EQ(pTSBuf->tsData.len, num * sizeof(int64_t)); EXPECT_EQ(pTSBuf->tsData.len, num * sizeof(int64_t));
EXPECT_EQ(pTSBuf->block.tag, numOfTags - 1); EXPECT_EQ(pTSBuf->block.tag, numOfTags - 1);
@ -252,7 +252,7 @@ void TSTraverse() {
int64_t s = taosGetTimestampUs(); int64_t s = taosGetTimestampUs();
printf("start:%" PRIu64 "\n", s); printf("start:%" PRIu64 "\n", s);
pTSBuf->cur.order = TSQL_SO_DESC; pTSBuf->cur.order = TSDB_ORDER_DESC;
// complete reverse traverse // complete reverse traverse
int32_t x = 0; int32_t x = 0;
@ -263,7 +263,7 @@ void TSTraverse() {
// specify the data block with vnode and tags value // specify the data block with vnode and tags value
tsBufResetPos(pTSBuf); tsBufResetPos(pTSBuf);
pTSBuf->cur.order = TSQL_SO_DESC; pTSBuf->cur.order = TSDB_ORDER_DESC;
int32_t startVnode = 1; int32_t startVnode = 1;
int32_t startTag = 2; int32_t startTag = 2;
@ -297,7 +297,7 @@ void TSTraverse() {
///////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////
// traverse // traverse
pTSBuf->cur.order = TSQL_SO_ASC; pTSBuf->cur.order = TSDB_ORDER_ASC;
tsBufResetPos(pTSBuf); tsBufResetPos(pTSBuf);
// complete forwards traverse // complete forwards traverse
@ -308,7 +308,7 @@ void TSTraverse() {
// specify the data block with vnode and tags value // specify the data block with vnode and tags value
tsBufResetPos(pTSBuf); tsBufResetPos(pTSBuf);
pTSBuf->cur.order = TSQL_SO_ASC; pTSBuf->cur.order = TSDB_ORDER_ASC;
startVnode = 1; startVnode = 1;
startTag = 2; startTag = 2;