support function as expression tree node

src/client/src/tscSQLParser.c

@@ -4380,7 +4380,9 @@ static int32_t validateSQLExprTerm(SSqlCmd* pCmd, tSqlExpr* pExpr,
 
     if (uidLeft != uidRight && uidLeft != 0 && uidRight != 0) {
       return TSDB_CODE_TSC_INVALID_OPERATION;
+    }
     *uid = uidLeft;
+
   } else if (pExpr->type == SQL_NODE_SQLFUNCTION) {
     validateArithmeticSQLFunc(pCmd, pExpr, pQueryInfo, pList, type, uid);
   } else if (pExpr->type == SQL_NODE_TABLE_COLUMN) {
@@ -4410,7 +4412,6 @@ static int32_t validateSQLExprTerm(SSqlCmd* pCmd, tSqlExpr* pExpr,
              pExpr->tokenId == TK_NULL) {
     return TSDB_CODE_TSC_INVALID_OPERATION;
   }
-  }
   return TSDB_CODE_SUCCESS;
 }
 
@@ -9266,33 +9267,7 @@ int32_t validateSqlNode(SSqlObj* pSql, SSqlNode* pSqlNode, SQueryInfo* pQueryInf
 }
 
 int32_t exprTreeFromSqlExpr(SSqlCmd* pCmd, tExprNode **pExpr, const tSqlExpr* pSqlExpr, SQueryInfo* pQueryInfo, SArray* pCols, uint64_t *uid) {
-  tExprNode* pLeft = NULL;
-  tExprNode* pRight= NULL;
-  SColumnIndex index = COLUMN_INDEX_INITIALIZER;
-  
-  if (pSqlExpr->pLeft != NULL) {
-    int32_t ret = exprTreeFromSqlExpr(pCmd, &pLeft, pSqlExpr->pLeft, pQueryInfo, pCols, uid);
-    if (ret != TSDB_CODE_SUCCESS) {
-      return ret;
-    }
-  }
-  
-  if (pSqlExpr->pRight != NULL) {
-    int32_t ret = exprTreeFromSqlExpr(pCmd, &pRight, pSqlExpr->pRight, pQueryInfo, pCols, uid);
-    if (ret != TSDB_CODE_SUCCESS) {
-      tExprTreeDestroy(pLeft, NULL);
-      return ret;
-    }
-  }
-
-  if (pSqlExpr->pLeft == NULL && pSqlExpr->pRight == NULL && pSqlExpr->tokenId == 0) {
-    *pExpr = calloc(1, sizeof(tExprNode));
-    return TSDB_CODE_SUCCESS;
-  }
-  
-  if (pSqlExpr->pLeft == NULL) {  // it is the leaf node
-    assert(pSqlExpr->pRight == NULL);
-
+  if (pSqlExpr->pLeft == NULL && pSqlExpr->pRight == NULL) {
     if (pSqlExpr->type == SQL_NODE_VALUE) {
       int32_t ret = TSDB_CODE_SUCCESS;
       *pExpr = calloc(1, sizeof(tExprNode));
@@ -9315,52 +9290,9 @@ int32_t exprTreeFromSqlExpr(SSqlCmd* pCmd, tExprNode **pExpr, const tSqlExpr* pS
         }
       }
       return ret;
-    } else if (pSqlExpr->type == SQL_NODE_SQLFUNCTION) {
-      if (TSDB_FUNC_IS_SCALAR(pSqlExpr->functionId)) {
-        *pExpr = calloc(1, sizeof(tExprNode));
-        (*pExpr)->nodeType = TSQL_NODE_FUNC;
-        (*pExpr)->_func.functionId = pSqlExpr->functionId;
-        SArray* paramList = pSqlExpr->Expr.paramList;
-        size_t paramSize = taosArrayGetSize(paramList);
-        if (paramSize > 0) {
-          (*pExpr)->_func.numChilds = paramSize;
-          (*pExpr)->_func.pChilds = (tExprNode**)calloc(paramSize, sizeof(tExprNode*));
-        }
-        for (int i = 0; i < taosArrayGetSize(paramList); ++i) {
-          tSqlExprItem* param = taosArrayGet(paramList, i);
-          tSqlExpr* paramNode = param->pNode;
-          int32_t ret = exprTreeFromSqlExpr(pCmd, (*pExpr)->_func.pChilds+i, paramNode, pQueryInfo, pCols, uid);
-          if (ret != TSDB_CODE_SUCCESS) {
-            return ret;
-          }
-        }
-      } else {
-        // arithmetic expression on the results of aggregation functions
-        *pExpr = calloc(1, sizeof(tExprNode));
-        (*pExpr)->nodeType = TSQL_NODE_COL;
-        (*pExpr)->pSchema = calloc(1, sizeof(SSchema));
-        strncpy((*pExpr)->pSchema->name, pSqlExpr->exprToken.z, pSqlExpr->exprToken.n);
-
-        // set the input column data byte and type.
-        size_t size = taosArrayGetSize(pQueryInfo->exprList);
-
-        for (int32_t i = 0; i < size; ++i) {
-          SExprInfo* p1 = taosArrayGetP(pQueryInfo->exprList, i);
-
-          if (strcmp((*pExpr)->pSchema->name, p1->base.aliasName) == 0) {
-            (*pExpr)->pSchema->type = (uint8_t)p1->base.resType;
-            (*pExpr)->pSchema->bytes = p1->base.resBytes;
-            (*pExpr)->pSchema->colId = p1->base.resColId;
-
-            if (uid != NULL) {
-              *uid = p1->base.uid;
-            }
-
-            break;
-          }
-        } // endfor each expr
-      } // end not scalar function
     } else if (pSqlExpr->type == SQL_NODE_TABLE_COLUMN) {  // column name, normal column arithmetic expression
+      SColumnIndex index = COLUMN_INDEX_INITIALIZER;
+
       int32_t ret = getColumnIndexByName(&pSqlExpr->columnName, pQueryInfo, &index, tscGetErrorMsgPayload(pCmd));
       if (ret != TSDB_CODE_SUCCESS) {
         return ret;
@@ -9392,11 +9324,10 @@ int32_t exprTreeFromSqlExpr(SSqlCmd* pCmd, tExprNode **pExpr, const tSqlExpr* pS
         tstrncpy(colIndex.name, pSchema->name, sizeof(colIndex.name));
         colIndex.colId = pSchema->colId;
         colIndex.colIndex = index.columnIndex;
-        colIndex.flag = (index.columnIndex >= numOfColumns)? 1:0;
+        colIndex.flag = (index.columnIndex >= numOfColumns) ? 1 : 0;
 
         taosArrayPush(pCols, &colIndex);
       }
-      
       return TSDB_CODE_SUCCESS;
     } else if (pSqlExpr->tokenId == TK_SET) {
       int32_t colType = -1;
@@ -9430,11 +9361,34 @@ int32_t exprTreeFromSqlExpr(SSqlCmd* pCmd, tExprNode **pExpr, const tSqlExpr* pS
       *pExpr = calloc(1, sizeof(tExprNode));
       (*pExpr)->nodeType = TSQL_NODE_VALUE;
       (*pExpr)->pVal = pVal;
+      return TSDB_CODE_SUCCESS;
+    } else if (pSqlExpr->tokenId == 0) {
+      *pExpr = calloc(1, sizeof(tExprNode));
+      return TSDB_CODE_SUCCESS;
     } else {
       return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), "not support filter expression");
     }
+  }
+
+  if (pSqlExpr->type == SQL_NODE_EXPR) {
+    tExprNode* pLeft = NULL;
+    tExprNode* pRight= NULL;
+
+    if (pSqlExpr->pLeft != NULL) {
+      int32_t ret = exprTreeFromSqlExpr(pCmd, &pLeft, pSqlExpr->pLeft, pQueryInfo, pCols, uid);
+      if (ret != TSDB_CODE_SUCCESS) {
+        return ret;
+      }
+    }
+
+    if (pSqlExpr->pRight != NULL) {
+      int32_t ret = exprTreeFromSqlExpr(pCmd, &pRight, pSqlExpr->pRight, pQueryInfo, pCols, uid);
+      if (ret != TSDB_CODE_SUCCESS) {
+        tExprTreeDestroy(pLeft, NULL);
+        return ret;
+      }
+    }
 
-  } else {
     *pExpr = (tExprNode *)calloc(1, sizeof(tExprNode));
     (*pExpr)->nodeType = TSQL_NODE_EXPR;
 
@@ -9466,8 +9420,52 @@ int32_t exprTreeFromSqlExpr(SSqlCmd* pCmd, tExprNode **pExpr, const tSqlExpr* pS
         }
       }
     }
+
+  } else if (pSqlExpr->type == SQL_NODE_SQLFUNCTION) {
+    if (TSDB_FUNC_IS_SCALAR(pSqlExpr->functionId)) {
+      *pExpr = calloc(1, sizeof(tExprNode));
+      (*pExpr)->nodeType = TSQL_NODE_FUNC;
+      (*pExpr)->_func.functionId = pSqlExpr->functionId;
+      SArray* paramList = pSqlExpr->Expr.paramList;
+      size_t paramSize = taosArrayGetSize(paramList);
+      if (paramSize > 0) {
+        (*pExpr)->_func.numChildren = paramSize;
+        (*pExpr)->_func.pChildren = (tExprNode**)calloc(paramSize, sizeof(tExprNode*));
+      }
+      for (int i = 0; i < taosArrayGetSize(paramList); ++i) {
+        tSqlExprItem* param = taosArrayGet(paramList, i);
+        tSqlExpr* paramNode = param->pNode;
+        int32_t ret = exprTreeFromSqlExpr(pCmd, (*pExpr)->_func.pChildren+i, paramNode, pQueryInfo, pCols, uid);
+        if (ret != TSDB_CODE_SUCCESS) {
+          return ret;
+        }
       }
+    } else {
+      // arithmetic expression on the results of aggregation functions
+      *pExpr = calloc(1, sizeof(tExprNode));
+      (*pExpr)->nodeType = TSQL_NODE_COL;
+      (*pExpr)->pSchema = calloc(1, sizeof(SSchema));
+      strncpy((*pExpr)->pSchema->name, pSqlExpr->exprToken.z, pSqlExpr->exprToken.n);
+
+      // set the input column data byte and type.
+      size_t size = taosArrayGetSize(pQueryInfo->exprList);
+
+      for (int32_t i = 0; i < size; ++i) {
+        SExprInfo* p1 = taosArrayGetP(pQueryInfo->exprList, i);
+
+        if (strcmp((*pExpr)->pSchema->name, p1->base.aliasName) == 0) {
+          (*pExpr)->pSchema->type = (uint8_t)p1->base.resType;
+          (*pExpr)->pSchema->bytes = p1->base.resBytes;
+          (*pExpr)->pSchema->colId = p1->base.resColId;
 
+          if (uid != NULL) {
+            *uid = p1->base.uid;
+          }
+          break;
+        }
+      } // endfor each expr
+    } // end not scalar function
+  }
   return TSDB_CODE_SUCCESS;
 }
 

src/common/inc/texpr.h

@@ -80,8 +80,8 @@ typedef struct tExprNode {
 
     struct {
       int16_t functionId;
-      uint8_t numChilds;
-      struct tExprNode** pChilds;
+      uint8_t numChildren;
+      struct tExprNode** pChildren;
     } _func;
   };
 } tExprNode;

src/common/src/texpr.c

@@ -144,8 +144,8 @@ static void doExprTreeDestroy(tExprNode **pExpr, void (*fp)(void *)) {
   } else if ((*pExpr)->nodeType == TSQL_NODE_COL) {
     free((*pExpr)->pSchema);
   } else if ((*pExpr)->nodeType == TSQL_NODE_FUNC) {
-    for (int i = 0; i < (*pExpr)->_func.numChilds; ++i) {
-      doExprTreeDestroy((*pExpr)->_func.pChilds + i, fp);
+    for (int i = 0; i < (*pExpr)->_func.numChildren; ++i) {
+      doExprTreeDestroy((*pExpr)->_func.pChildren + i, fp);
     }
   }
 
@@ -315,9 +315,9 @@ static void exprTreeToBinaryImpl(SBufferWriter* bw, tExprNode* expr) {
     exprTreeToBinaryImpl(bw, expr->_node.pRight);
   } else if (expr->nodeType == TSQL_NODE_FUNC) {
     tbufWriteInt16(bw, expr->_func.functionId);
-    tbufWriteUint8(bw, expr->_func.numChilds);
-    for (int i = 0; i < expr->_func.numChilds; ++i) {
-      exprTreeToBinaryImpl(bw, expr->_func.pChilds[i]);
+    tbufWriteUint8(bw, expr->_func.numChildren);
+    for (int i = 0; i < expr->_func.numChildren; ++i) {
+      exprTreeToBinaryImpl(bw, expr->_func.pChildren[i]);
     }
   }
 }
@@ -386,10 +386,10 @@ static tExprNode* exprTreeFromBinaryImpl(SBufferReader* br) {
     assert(pExpr->_node.pLeft != NULL && pExpr->_node.pRight != NULL);
   } else if (pExpr->nodeType == TSQL_NODE_FUNC) {
     pExpr->_func.functionId = tbufReadInt16(br);
-    pExpr->_func.numChilds = tbufReadUint8(br);
-    pExpr->_func.pChilds = (tExprNode**)calloc(pExpr->_func.numChilds, sizeof(tExprNode*));
-    for (int i = 0; i < pExpr->_func.numChilds; ++i) {
-      pExpr->_func.pChilds[i] = exprTreeFromBinaryImpl(br);
+    pExpr->_func.numChildren = tbufReadUint8(br);
+    pExpr->_func.pChildren = (tExprNode**)calloc(pExpr->_func.numChildren, sizeof(tExprNode*));
+    for (int i = 0; i < pExpr->_func.numChildren; ++i) {
+      pExpr->_func.pChildren[i] = exprTreeFromBinaryImpl(br);
     }
   }
   
@@ -641,9 +641,9 @@ tExprNode* exprdup(tExprNode* pNode) {
     *pCloned->pSchema = *pNode->pSchema;
   } else if (pNode->nodeType == TSQL_NODE_FUNC) {
     pCloned->_func.functionId = pNode->_func.functionId;
-    pCloned->_func.numChilds = pNode->_func.numChilds;
-    for (int i = 0; i < pNode->_func.numChilds; ++i) {
-      pCloned->_func.pChilds[i] = exprdup(pNode->_func.pChilds[i]);
+    pCloned->_func.numChildren = pNode->_func.numChildren;
+    for (int i = 0; i < pNode->_func.numChildren; ++i) {
+      pCloned->_func.pChildren[i] = exprdup(pNode->_func.pChildren[i]);
     }
   }