From 68f019e3db993c14111ee85692fafff01a0ed9fc Mon Sep 17 00:00:00 2001
From: shenglian zhou <shenglian_zhou@163.com>
Date: Fri, 5 Nov 2021 11:10:16 +0800
Subject: [PATCH] set ptsList for utf whenever the type and treat
 ceil/floor/round as scalar func in function compatible check

---
 src/client/src/tscSQLParser.c | 4 ----
 src/query/src/qExecutor.c     | 7 +------
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/src/client/src/tscSQLParser.c b/src/client/src/tscSQLParser.c
index 7512ff7f06..04e1f3aafe 100644
--- a/src/client/src/tscSQLParser.c
+++ b/src/client/src/tscSQLParser.c
@@ -3751,10 +3751,6 @@ static bool functionCompatibleCheck(SQueryInfo* pQueryInfo, bool joinQuery, bool
       ++scalarFuncNum;
     }
 
-    if (IS_SCALAR_FUNCTION(functionId)) {
-      ++scalarFuncNum;
-    }
-
     if (TSDB_FUNC_IS_SCALAR(functionId)) {
       ++scalarFuncNum;
     }
diff --git a/src/query/src/qExecutor.c b/src/query/src/qExecutor.c
index 26e2c247ae..1a0846ee35 100644
--- a/src/query/src/qExecutor.c
+++ b/src/query/src/qExecutor.c
@@ -1265,12 +1265,7 @@ static void doSetInputDataBlock(SOperatorInfo* pOperator, SQLFunctionCtx* pCtx,
 
         if (pCtx[i].functionId < 0 || TSDB_FUNC_IS_SCALAR(pCtx[i].functionId)) {
           SColumnInfoData* tsInfo = taosArrayGet(pBlock->pDataBlock, 0);
-          if (tsInfo->info.type == TSDB_DATA_TYPE_TIMESTAMP) {
-            pCtx[i].ptsList = (int64_t*)tsInfo->pData;
-          } else {
-            pCtx[i].ptsList = NULL;
-          }
-
+          pCtx[i].ptsList = (int64_t*)tsInfo->pData;
           continue;
         }
 
-- 
GitLab