[td-97] add express tree serialize and deserilize function and the corresponding unit test cases.

.gitignore

@@ -12,6 +12,7 @@ rpms/
 mac/
 *.pyc
 *.tmp
+*.swp
 src/connector/nodejs/node_modules/
 src/connector/nodejs/out/
 tests/test/

src/client/src/tscSQLParser.c

@@ -117,7 +117,7 @@ static int32_t doCheckForCreateFromStable(SSqlObj* pSql, SSqlInfo* pInfo);
 static int32_t doCheckForStream(SSqlObj* pSql, SSqlInfo* pInfo);
 static int32_t doCheckForQuery(SSqlObj* pSql, SQuerySQL* pQuerySql, int32_t index);
 
-static int32_t tSQLBinaryExprCreateFromSqlExpr(tExprNode **pExpr, tSQLExpr* pAst, int32_t* num,
+static int32_t convertSyntaxTreeToExprTree(tExprNode **pExpr, tSQLExpr* pAst, int32_t* num,
     SColIndexEx** pColIndex, SSqlExprInfo* pExprInfo);
 
 /*
@@ -1211,9 +1211,9 @@ int32_t parseSelectClause(SSqlCmd* pCmd, int32_t clauseIndex, tSQLExprList* pSel
           tExprNode* pNode = NULL;
           SColIndexEx* pColIndex = NULL;
           
-          int32_t ret = tSQLBinaryExprCreateFromSqlExpr(&pNode, pItem->pNode, &pBinExprInfo->numOfCols, &pColIndex, &pQueryInfo->exprsInfo);
+          int32_t ret = convertSyntaxTreeToExprTree(&pNode, pItem->pNode, &pBinExprInfo->numOfCols, &pColIndex, &pQueryInfo->exprsInfo);
           if (ret != TSDB_CODE_SUCCESS) {
-            tSQLBinaryExprDestroy(&pNode, NULL);
+            tExprTreeDestroy(&pNode, NULL);
             return invalidSqlErrMsg(pQueryInfo->msg, "invalid expression in select clause");
           }
           
@@ -5807,20 +5807,20 @@ int32_t doCheckForQuery(SSqlObj* pSql, SQuerySQL* pQuerySql, int32_t index) {
   return TSDB_CODE_SUCCESS;  // Does not build query message here
 }
 
-static int32_t tSQLBinaryExprCreateFromSqlExpr(tExprNode **pExpr, tSQLExpr* pAst, int32_t* num,
+static int32_t convertSyntaxTreeToExprTree(tExprNode **pExpr, tSQLExpr* pAst, int32_t* num,
     SColIndexEx** pColIndex, SSqlExprInfo* pExprInfo) {
   tExprNode* pLeft = NULL;
   tExprNode* pRight= NULL;
   
   if (pAst->pLeft != NULL) {
-    int32_t ret = tSQLBinaryExprCreateFromSqlExpr(&pLeft, pAst->pLeft, num, pColIndex, pExprInfo);
+    int32_t ret = convertSyntaxTreeToExprTree(&pLeft, pAst->pLeft, num, pColIndex, pExprInfo);
     if (ret != TSDB_CODE_SUCCESS) {
       return ret;
     }
   }
   
   if (pAst->pRight != NULL) {
-    int32_t ret = tSQLBinaryExprCreateFromSqlExpr(&pRight, pAst->pRight, num, pColIndex, pExprInfo);
+    int32_t ret = convertSyntaxTreeToExprTree(&pRight, pAst->pRight, num, pColIndex, pExprInfo);
     if (ret != TSDB_CODE_SUCCESS) {
       return ret;
     }

src/client/src/tscUtil.c

@@ -1105,7 +1105,7 @@ void tscClearFieldInfo(SFieldInfo* pFieldInfo) {
   
   for(int32_t i = 0; i < pFieldInfo->numOfOutputCols; ++i) {
     if (pFieldInfo->pExpr[i] != NULL) {
-      tSQLBinaryExprDestroy(&pFieldInfo->pExpr[i]->binExprInfo.pBinExpr, NULL);
+      tExprTreeDestroy(&pFieldInfo->pExpr[i]->binExprInfo.pBinExpr, NULL);
       tfree(pFieldInfo->pExpr[i]->binExprInfo.pReqColumns);
       tfree(pFieldInfo->pExpr[i]);
     }

src/query/inc/qast.h

@@ -16,6 +16,7 @@
 #ifndef TDENGINE_TAST_H
 #define TDENGINE_TAST_H
 
+#include <tbuffer.h>
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -64,9 +65,9 @@ typedef struct tExprNode {
   uint8_t nodeType;
   union {
     struct {
-      uint8_t optr;  // filter operator
-      uint8_t hasPK; // 0: do not contain primary filter, 1: contain
-      void *  info;  // support filter operation on this expression only available for leaf node
+      uint8_t optr;             // filter operator
+      uint8_t hasPK;            // 0: do not contain primary filter, 1: contain
+      void *  info;             // support filter operation on this expression only available for leaf node
       
       struct tExprNode *pLeft;  // left child pointer
       struct tExprNode *pRight; // right child pointer
@@ -80,7 +81,7 @@ void tSQLBinaryExprFromString(tExprNode **pExpr, SSchema *pSchema, int32_t numOf
 
 void tSQLBinaryExprToString(tExprNode *pExpr, char *dst, int32_t *len);
 
-void tSQLBinaryExprDestroy(tExprNode **pExprs, void (*fp)(void*));
+void tExprTreeDestroy(tExprNode **pExprs, void (*fp)(void*));
 
 void tSQLBinaryExprTraverse(tExprNode *pExpr, SSkipList *pSkipList, SArray *result, SBinaryFilterSupp *param);
 
@@ -91,6 +92,10 @@ void tSQLBinaryExprTrv(tExprNode *pExprs, int32_t *val, int16_t *ids);
 
 uint8_t getBinaryExprOptr(SSQLToken *pToken);
 
+SBuffer exprTreeToBinary(tExprNode* pExprTree);
+
+tExprNode* exprTreeFromBinary(const void* pBuf, size_t size);
+
 #ifdef __cplusplus
 }
 #endif

src/query/src/qast.c

@@ -13,10 +13,11 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-
 #include "os.h"
 
 #include "tutil.h"
+#include "tbuffer.h"
+#include "qast.h"
 #include "qsqlparser.h"
 #include "qsyntaxtreefunction.h"
 #include "taosdef.h"
@@ -26,9 +27,7 @@
 #include "tstoken.h"
 #include "ttokendef.h"
 
-
 #include "../../client/inc/tschemautil.h"
-#include "qast.h"
 #include "tarray.h"
 #include "tskiplist.h"
 
@@ -246,6 +245,7 @@ static tExprNode *createSyntaxTree(SSchema *pSchema, int32_t numOfCols, char *st
     if (t0.type == TK_RP) {
       return NULL;
     }
+    
     pLeft = tExprNodeCreate(pSchema, numOfCols, &t0);
   }
 
@@ -433,24 +433,33 @@ static void tExprNodeDestroy(tExprNode *pNode, void (*fp)(void *)) {
   }
 
   if (pNode->nodeType == TSQL_NODE_EXPR) {
-    tSQLBinaryExprDestroy(&pNode, fp);
+    tExprTreeDestroy(&pNode, fp);
   } else if (pNode->nodeType == TSQL_NODE_VALUE) {
     tVariantDestroy(pNode->pVal);
+  } else if (pNode->nodeType == TSQL_NODE_COL) {
+    free(pNode->pSchema);
   }
 
   free(pNode);
 }
 
-void tSQLBinaryExprDestroy(tExprNode **pExpr, void (*fp)(void *)) {
+void tExprTreeDestroy(tExprNode **pExpr, void (*fp)(void *)) {
   if (*pExpr == NULL) {
     return;
   }
-
-  tExprNodeDestroy((*pExpr)->_node.pLeft, fp);
-  tExprNodeDestroy((*pExpr)->_node.pRight, fp);
-
-  if (fp != NULL) {
-    fp((*pExpr)->_node.info);
+  
+  if ((*pExpr)->nodeType == TSQL_NODE_EXPR) {
+    tExprTreeDestroy(&(*pExpr)->_node.pLeft, fp);
+    tExprTreeDestroy(&(*pExpr)->_node.pRight, fp);
+  
+    if (fp != NULL) {
+      fp((*pExpr)->_node.info);
+    }
+  } else if ((*pExpr)->nodeType == TSQL_NODE_VALUE) {
+    tVariantDestroy((*pExpr)->pVal);
+    free((*pExpr)->pVal);
+  } else if ((*pExpr)->nodeType == TSQL_NODE_COL) {
+    free((*pExpr)->pSchema);
   }
 
   free(*pExpr);
@@ -916,3 +925,98 @@ void tSQLBinaryExprTrv(tExprNode *pExprs, int32_t *val, int16_t *ids) {
     (*val) += 1;
   }
 }
+
+static int32_t exprTreeToBinaryImpl(tExprNode* pExprTree, SBuffer* pBuf) {
+  tbufWrite(pBuf, &pExprTree->nodeType, sizeof(pExprTree->nodeType));
+  
+  if (pExprTree->nodeType == TSQL_NODE_VALUE) {
+    tVariant* pVal = pExprTree->pVal;
+    
+    tbufWrite(pBuf, &pVal->nType, sizeof(pVal->nType));
+    if (pVal->nType == TSDB_DATA_TYPE_BINARY) {
+      tbufWrite(pBuf, &pVal->nLen, sizeof(pVal->nLen));
+      tbufWrite(pBuf, pVal->pz, pVal->nLen);
+    } else {
+      tbufWrite(pBuf, &pVal->pz, sizeof(pVal->i64Key));
+    }
+    
+  } else if (pExprTree->nodeType == TSQL_NODE_COL) {
+    SSchema* pSchema = pExprTree->pSchema;
+    tbufWrite(pBuf, &pSchema->colId, sizeof(pSchema->colId));
+    tbufWrite(pBuf, &pSchema->bytes, sizeof(pSchema->bytes));
+    tbufWrite(pBuf, &pSchema->type, sizeof(pSchema->type));
+    
+    int32_t len = strlen(pSchema->name);
+    tbufWriteStringLen(pBuf, pSchema->name, len);
+    
+  } else if (pExprTree->nodeType == TSQL_NODE_EXPR) {
+    tbufWrite(pBuf, &pExprTree->_node.optr, sizeof(pExprTree->_node.optr));
+    tbufWrite(pBuf, &pExprTree->_node.hasPK, sizeof(pExprTree->_node.hasPK));
+  
+    exprTreeToBinaryImpl(pExprTree->_node.pLeft, pBuf);
+    exprTreeToBinaryImpl(pExprTree->_node.pRight, pBuf);
+  }
+}
+
+SBuffer exprTreeToBinary(tExprNode* pExprTree) {
+  SBuffer buf = {0};
+  if (pExprTree == NULL) {
+    return buf;
+  }
+  
+  int32_t code = tbufBeginWrite(&buf);
+  if (code != 0) {
+    return buf;
+  }
+  
+  exprTreeToBinaryImpl(pExprTree, &buf);
+  return buf;
+}
+
+static tExprNode* exprTreeFromBinaryImpl(tExprNode** pExprTree, SBuffer* pBuf) {
+  tExprNode* pExpr = calloc(1, sizeof(tExprNode));
+  tbufReadToBuffer(pBuf, &pExpr->nodeType, sizeof(pExpr->nodeType));
+  
+  if (pExpr->nodeType == TSQL_NODE_VALUE) {
+    tVariant* pVal = calloc(1, sizeof(tVariant));
+  
+    tbufReadToBuffer(pBuf, &pVal->nType, sizeof(pVal->nType));
+    if (pVal->nType == TSDB_DATA_TYPE_BINARY) {
+      tbufReadToBuffer(pBuf, &pVal->nLen, sizeof(pVal->nLen));
+      pVal->pz = calloc(1, pVal->nLen + 1);
+      tbufReadToBuffer(pBuf, pVal->pz, pVal->nLen);
+    } else {
+      tbufReadToBuffer(pBuf, &pVal->pz, sizeof(pVal->i64Key));
+    }
+    
+    pExpr->pVal = pVal;
+  } else if (pExpr->nodeType == TSQL_NODE_COL) {
+    SSchema* pSchema = calloc(1, sizeof(SSchema));
+    tbufReadToBuffer(pBuf, &pSchema->colId, sizeof(pSchema->colId));
+    tbufReadToBuffer(pBuf, &pSchema->bytes, sizeof(pSchema->bytes));
+    tbufReadToBuffer(pBuf, &pSchema->type, sizeof(pSchema->type));
+    
+    tbufReadToString(pBuf, pSchema->name, TSDB_COL_NAME_LEN);
+    
+    pExpr->pSchema = pSchema;
+  } else if (pExpr->nodeType == TSQL_NODE_EXPR) {
+    tbufReadToBuffer(pBuf, &pExpr->_node.optr, sizeof(pExpr->_node.optr));
+    tbufReadToBuffer(pBuf, &pExpr->_node.hasPK, sizeof(pExpr->_node.hasPK));
+  
+    exprTreeFromBinaryImpl(&pExpr->_node.pLeft, pBuf);
+    exprTreeFromBinaryImpl(&pExpr->_node.pRight, pBuf);
+    
+    assert(pExpr->_node.pLeft != NULL && pExpr->_node.pRight != NULL);
+  }
+  
+  *pExprTree = pExpr;
+}
+
+tExprNode* exprTreeFromBinary(const void* pBuf, size_t size) {
+  SBuffer rbuf = {0};
+  int32_t code = tbufBeginRead(&rbuf, pBuf, size);
+  
+  tExprNode* pExprNode = NULL;
+  exprTreeFromBinaryImpl(&pExprNode, &rbuf);
+  return pExprNode;
+}
\ No newline at end of file

src/query/src/queryExecutor.c

@@ -5961,7 +5961,7 @@ static void freeQInfo(SQInfo *pQInfo) {
       
       if (pBinExprInfo->numOfCols > 0) {
         tfree(pBinExprInfo->pReqColumns);
-        tSQLBinaryExprDestroy(&pBinExprInfo->pBinExpr, NULL);
+        tExprTreeDestroy(&pBinExprInfo->pBinExpr, NULL);
       }
     }
     

src/util/inc/tbuffer.h

@@ -13,14 +13,15 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <stddef.h>
-#include <stdint.h>
-#include <stdbool.h>
-#include <setjmp.h>
-
 #ifndef TDENGINE_TBUFFER_H
 #define TDENGINE_TBUFFER_H
 
+#include "setjmp.h"
+#include "os.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 /*
 SBuffer can be used to read or write a buffer, but cannot be used for both
@@ -80,37 +81,33 @@ int main(int argc, char** argv) {
 */
 typedef struct {
   jmp_buf jb;
-  char* data;
-  size_t pos;
-  size_t size;
+  char*   data;
+  size_t  pos;
+  size_t  size;
 } SBuffer;
 
-
 // common functions can be used in both read & write
 #define tbufThrowError(buf, code) longjmp((buf)->jb, (code))
 size_t tbufTell(SBuffer* buf);
 size_t tbufSeekTo(SBuffer* buf, size_t pos);
 size_t tbufSkip(SBuffer* buf, size_t size);
-void tbufClose(SBuffer* buf, bool keepData);
-
+void   tbufClose(SBuffer* buf, bool keepData);
 
 // basic read functions
-#define tbufBeginRead(buf, data, len) (((buf)->data = (char*)data), ((buf)->pos = 0), ((buf)->size = ((data) == NULL) ? 0 : (len)), setjmp((buf)->jb))
-char* tbufRead(SBuffer* buf, size_t size);
-void tbufReadToBuffer(SBuffer* buf, void* dst, size_t size);
+#define tbufBeginRead(buf, _data, len) ((buf)->data = (char*)(_data), ((buf)->pos = 0), ((buf)->size = ((_data) == NULL) ? 0 : (len)), setjmp((buf)->jb))
+char*       tbufRead(SBuffer* buf, size_t size);
+void        tbufReadToBuffer(SBuffer* buf, void* dst, size_t size);
 const char* tbufReadString(SBuffer* buf, size_t* len);
-size_t tbufReadToString(SBuffer* buf, char* dst, size_t size);
-
+size_t      tbufReadToString(SBuffer* buf, char* dst, size_t size);
 
 // basic write functions
 #define tbufBeginWrite(buf) ((buf)->data = NULL, ((buf)->pos = 0), ((buf)->size = 0), setjmp((buf)->jb))
-void tbufEnsureCapacity(SBuffer* buf, size_t size);
+void  tbufEnsureCapacity(SBuffer* buf, size_t size);
 char* tbufGetData(SBuffer* buf, bool takeOver);
-void tbufWrite(SBuffer* buf, const void* data, size_t size);
-void tbufWriteAt(SBuffer* buf, size_t pos, const void* data, size_t size);
-void tbufWriteStringLen(SBuffer* buf, const char* str, size_t len);
-void tbufWriteString(SBuffer* buf, const char* str);
-
+void  tbufWrite(SBuffer* buf, const void* data, size_t size);
+void  tbufWriteAt(SBuffer* buf, size_t pos, const void* data, size_t size);
+void  tbufWriteStringLen(SBuffer* buf, const char* str, size_t len);
+void  tbufWriteString(SBuffer* buf, const char* str);
 
 // read & write function for primitive types
 #ifndef TBUFFER_DEFINE_FUNCTION
@@ -120,17 +117,21 @@ void tbufWriteString(SBuffer* buf, const char* str);
   void tbufWrite##name##At(SBuffer* buf, size_t pos, type data);
 #endif
 
-TBUFFER_DEFINE_FUNCTION( bool, Bool )
-TBUFFER_DEFINE_FUNCTION( char, Char )
-TBUFFER_DEFINE_FUNCTION( int8_t, Int8 )
-TBUFFER_DEFINE_FUNCTION( uint8_t, Unt8 )
-TBUFFER_DEFINE_FUNCTION( int16_t, Int16 )
-TBUFFER_DEFINE_FUNCTION( uint16_t, Uint16 )
-TBUFFER_DEFINE_FUNCTION( int32_t, Int32 )
-TBUFFER_DEFINE_FUNCTION( uint32_t, Uint32 )
-TBUFFER_DEFINE_FUNCTION( int64_t, Int64 )
-TBUFFER_DEFINE_FUNCTION( uint64_t, Uint64 )
-TBUFFER_DEFINE_FUNCTION( float, Float )
-TBUFFER_DEFINE_FUNCTION( double, Double )
+TBUFFER_DEFINE_FUNCTION(bool, Bool)
+TBUFFER_DEFINE_FUNCTION(char, Char)
+TBUFFER_DEFINE_FUNCTION(int8_t, Int8)
+TBUFFER_DEFINE_FUNCTION(uint8_t, Unt8)
+TBUFFER_DEFINE_FUNCTION(int16_t, Int16)
+TBUFFER_DEFINE_FUNCTION(uint16_t, Uint16)
+TBUFFER_DEFINE_FUNCTION(int32_t, Int32)
+TBUFFER_DEFINE_FUNCTION(uint32_t, Uint32)
+TBUFFER_DEFINE_FUNCTION(int64_t, Int64)
+TBUFFER_DEFINE_FUNCTION(uint64_t, Uint64)
+TBUFFER_DEFINE_FUNCTION(float, Float)
+TBUFFER_DEFINE_FUNCTION(double, Double)
+
+#ifdef __cplusplus
+}
+#endif
 
 #endif
\ No newline at end of file

src/util/src/tbuffer.c

@@ -30,7 +30,7 @@
     tbufWriteAt(buf, pos, &data, sizeof(data));\
   }
 
-#include "../inc/tbuffer.h"
+#include "tbuffer.h"
 
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -119,13 +119,14 @@ void tbufEnsureCapacity(SBuffer* buf, size_t size) {
 }
 
 char* tbufGetData(SBuffer* buf, bool takeOver) {
-		char* ret = buf->data;
-		if (takeOver) {
-      buf->pos = 0;
-      buf->size = 0;
-			buf->data = NULL;
-    }
-		return ret;
+  char* ret = buf->data;
+  if (takeOver) {
+    buf->pos = 0;
+    buf->size = 0;
+    buf->data = NULL;
+  }
+
+  return ret;
 }
 
 void tbufEndWrite(SBuffer* buf) {

src/vnode/tsdb/src/tsdbRead.c

@@ -1310,7 +1310,7 @@ static int32_t doQueryTableList(STable* pSTable, SArray* pRes, const char* pCond
   };
   
   tSQLBinaryExprTraverse(pExpr, pSTable->pIndex, pRes, &supp);
-  tSQLBinaryExprDestroy(&pExpr, tSQLListTraverseDestroyInfo);
+  tExprTreeDestroy(&pExpr, tSQLListTraverseDestroyInfo);
   
   tansformQueryResult(pRes);