From 4241da56e1b26091573656eb61d511066bfcc9a4 Mon Sep 17 00:00:00 2001
From: hjxilinx <hjxilinx@163.com>
Date: Fri, 10 Apr 2020 23:16:56 +0800
Subject: [PATCH] [td-98] update macro

---
 src/query/tests/astTest.cpp   | 12 +++++++-----
 src/query/tests/tsBufTest.cpp | 18 +++++++++---------
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/src/query/tests/astTest.cpp b/src/query/tests/astTest.cpp
index 3b1f36e90f..0f41ebea26 100644
--- a/src/query/tests/astTest.cpp
+++ b/src/query/tests/astTest.cpp
@@ -255,7 +255,7 @@ static void testQueryStr(SSchema *schema, int32_t numOfCols, char *sql, tSkipLis
   printf("expr is: %s\n", str);
 
   SArray *result = NULL;
-  //  tSQLBinaryExprTraverse(pExpr, pSkipList, result, tSkipListNodeFilterCallback, &result);
+  //  tExprTreeTraverse(pExpr, pSkipList, result, tSkipListNodeFilterCallback, &result);
   //  printf("the result is:%lld\n", result.num);
   //
   //  bool findResult = false;
@@ -533,7 +533,7 @@ tExprNode* createExpr2() {
   auto *p2 = (tExprNode*) calloc(1, sizeof(tExprNode));
   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.pRight = pRight1;
   p2->_node.hasPK = false;
@@ -556,7 +556,8 @@ void exprSerializeTest1() {
   ASSERT_TRUE(size > 0);
   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(p2->_node.optr, p1->_node.optr);
@@ -592,7 +593,8 @@ void exprSerializeTest2() {
   ASSERT_TRUE(size > 0);
   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(p2->_node.optr, p1->_node.optr);
@@ -617,7 +619,7 @@ void exprSerializeTest2() {
   
   ASSERT_EQ(c1Right->nodeType, c2Right->nodeType);
   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(p2->_node.hasPK, true);
diff --git a/src/query/tests/tsBufTest.cpp b/src/query/tests/tsBufTest.cpp
index ff58e2a974..f50e1a5a71 100644
--- a/src/query/tests/tsBufTest.cpp
+++ b/src/query/tests/tsBufTest.cpp
@@ -37,7 +37,7 @@ void simpleTest() {
 
   int64_t* list = createTsList(10, 10000000, 30);
   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->block.tag, tag);
@@ -65,7 +65,7 @@ void largeTSTest() {
   EXPECT_EQ(pTSBuf->tsData.len, 0);
   EXPECT_EQ(pTSBuf->block.tag, tag);
   EXPECT_EQ(pTSBuf->numOfVnodes, 1);
-  EXPECT_EQ(pTSBuf->tsOrder, TSQL_SO_ASC);
+  EXPECT_EQ(pTSBuf->tsOrder, TSDB_ORDER_ASC);
 
   tsBufFlush(pTSBuf);
   EXPECT_EQ(pTSBuf->tsData.len, 0);
@@ -91,7 +91,7 @@ void multiTagsTest() {
     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->block.tag, numOfTags - 1);
@@ -127,7 +127,7 @@ void multiVnodeTagsTest() {
     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->block.tag, numOfTags - 1);
 
@@ -167,7 +167,7 @@ void loadDataTest() {
     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->block.tag, numOfTags - 1);
@@ -252,7 +252,7 @@ void TSTraverse() {
   int64_t s = taosGetTimestampUs();
   printf("start:%" PRIu64 "\n", s);
 
-  pTSBuf->cur.order = TSQL_SO_DESC;
+  pTSBuf->cur.order = TSDB_ORDER_DESC;
 
   // complete reverse traverse
   int32_t x = 0;
@@ -263,7 +263,7 @@ void TSTraverse() {
 
   // specify the data block with vnode and tags value
   tsBufResetPos(pTSBuf);
-  pTSBuf->cur.order = TSQL_SO_DESC;
+  pTSBuf->cur.order = TSDB_ORDER_DESC;
 
   int32_t startVnode = 1;
   int32_t startTag = 2;
@@ -297,7 +297,7 @@ void TSTraverse() {
 
   /////////////////////////////////////////////////////////////////////////////////
   // traverse
-  pTSBuf->cur.order = TSQL_SO_ASC;
+  pTSBuf->cur.order = TSDB_ORDER_ASC;
   tsBufResetPos(pTSBuf);
 
   // complete forwards traverse
@@ -308,7 +308,7 @@ void TSTraverse() {
 
   // specify the data block with vnode and tags value
   tsBufResetPos(pTSBuf);
-  pTSBuf->cur.order = TSQL_SO_ASC;
+  pTSBuf->cur.order = TSDB_ORDER_ASC;
 
   startVnode = 1;
   startTag = 2;
-- 
GitLab