From 8e495e8313fce75a2391a872af358a22aa090456 Mon Sep 17 00:00:00 2001
From: shenglian zhou <shenglian_zhou@163.com>
Date: Fri, 29 Oct 2021 10:22:52 +0800
Subject: [PATCH] move function process to arithmetic expr

---
 src/client/src/tscSQLParser.c | 47 ++++++++++++++++++++++++++---------
 src/common/inc/texpr.h        |  3 +--
 2 files changed, 36 insertions(+), 14 deletions(-)

diff --git a/src/client/src/tscSQLParser.c b/src/client/src/tscSQLParser.c
index ac47fc7f66..852c6fdd82 100644
--- a/src/client/src/tscSQLParser.c
+++ b/src/client/src/tscSQLParser.c
@@ -2007,6 +2007,22 @@ static SUdfInfo* isValidUdf(SArray* pUdfInfo, const char* name, int32_t len) {
   return NULL;
 }
 
+static bool willProcessFunctionWithExpr(const tSqlExprItem* pItem) {
+  assert(pItem->pNode->type == SQL_NODE_SQLFUNCTION);
+  int32_t functionId = pItem->pNode->functionId;
+
+  if (TSDB_FUNC_IS_SCALAR(functionId)) {
+    return true;
+  } else if (functionId == TSDB_FUNC_SUM ||
+             functionId == TSDB_FUNC_AVG ||
+             functionId == TSDB_FUNC_MAX ||
+             functionId == TSDB_FUNC_MIN) {
+    return true;
+  }
+
+  return false;
+}
+
 int32_t validateSelectNodeList(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, SArray* pSelNodeList, bool joinQuery,
                                bool timeWindowQuery, bool outerQuery) {
   assert(pSelNodeList != NULL && pCmd != NULL);
@@ -2045,7 +2061,12 @@ int32_t validateSelectNodeList(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, SArray* pS
     } 
 
     int32_t type = pItem->pNode->type;
-    if (type == SQL_NODE_SQLFUNCTION) {
+    if (type == SQL_NODE_EXPR) {
+      int32_t code = handleArithmeticExpr(pCmd, pQueryInfo, i, pItem);
+      if (code != TSDB_CODE_SUCCESS) {
+        return code;
+      }
+    } else if (type == SQL_NODE_SQLFUNCTION) {
       hasAgg = true; 
       if (hasDistinct)  break;
 
@@ -2069,9 +2090,16 @@ int32_t validateSelectNodeList(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, SArray* pS
         pItem->pNode->functionId = pUdfInfo->functionId;
       }
 
-      // sql function in selection clause, append sql function info in pSqlCmd structure sequentially
-      if (addExprAndResultField(pCmd, pQueryInfo, outputIndex, pItem, true, pUdfInfo) != TSDB_CODE_SUCCESS) {
-        return TSDB_CODE_TSC_INVALID_OPERATION;
+      if (willProcessFunctionWithExpr(pItem)) {
+        int32_t code = handleArithmeticExpr(pCmd, pQueryInfo, i, pItem);
+        if (code != TSDB_CODE_SUCCESS) {
+          return code;
+        }
+      } else {
+        // sql function in selection clause, append sql function info in pSqlCmd structure sequentially
+        if (addExprAndResultField(pCmd, pQueryInfo, outputIndex, pItem, true, pUdfInfo) != TSDB_CODE_SUCCESS) {
+          return TSDB_CODE_TSC_INVALID_OPERATION;
+        }
       }
     } else if (type == SQL_NODE_TABLE_COLUMN || type == SQL_NODE_VALUE) {
       // use the dynamic array list to decide if the function is valid or not
@@ -2079,12 +2107,7 @@ int32_t validateSelectNodeList(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, SArray* pS
       if (addProjectionExprAndResultField(pCmd, pQueryInfo, pItem, outerQuery) != TSDB_CODE_SUCCESS) {
         return TSDB_CODE_TSC_INVALID_OPERATION;
       }
-    } else if (type == SQL_NODE_EXPR) {
-      int32_t code = handleArithmeticExpr(pCmd, pQueryInfo, i, pItem);
-      if (code != TSDB_CODE_SUCCESS) {
-        return code;
-      }
-    } else {
+    }  else {
       return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg3);
     }
 
@@ -4310,10 +4333,10 @@ static int32_t validateArithmeticSQLFunc(SSqlCmd* pCmd, tSqlExpr* pExpr,
     }
   } else if (*type == NORMAL_ARITHMETIC) {
     if (!TSDB_FUNC_IS_SCALAR(functionId)) {
-      return TSDB_CODE_TSC_INVALID_OPERATION;
+      *type = AGG_ARIGHTMEIC;
     }
   } else {
-    if (TSDB_FUNC_IS_SCALAR(functionId)) {
+    if (!TSDB_FUNC_IS_SCALAR(functionId)) {
       return TSDB_CODE_TSC_INVALID_OPERATION;
     }
   }
diff --git a/src/common/inc/texpr.h b/src/common/inc/texpr.h
index c6c11a9459..59c29165ac 100644
--- a/src/common/inc/texpr.h
+++ b/src/common/inc/texpr.h
@@ -41,9 +41,8 @@ struct SSchema;
 #define QUERY_COND_REL_PREFIX_MATCH_LEN 6
 #define QUERY_COND_REL_PREFIX_NMATCH_LEN 7
 
-#define TSDB_FUNC_FLAG_UDF          0x8000
 #define TSDB_FUNC_FLAG_SCALAR       0x4000
-#define TSDB_FUNC_IS_SCALAR(id)     ((((id) & TSDB_FUNC_FLAG_UDF) == 0) && (((id) & TSDB_FUNC_FLAG_SCALAR) != 0))
+#define TSDB_FUNC_IS_SCALAR(id)     ((((id) > 0)) && (((id) & TSDB_FUNC_FLAG_SCALAR) != 0))
 #define TSDB_FUNC_SCALAR_INDEX(id)  ((id) & ~TSDB_FUNC_FLAG_SCALAR)
 ///////////////////////////////////////////
 // SCALAR FUNCTIONS
-- 
GitLab