From 329797ce233666b31ca1375245e8e6d319a5d478 Mon Sep 17 00:00:00 2001
From: kailixu <klxu@taosdata.com>
Date: Tue, 23 May 2023 10:57:34 +0800
Subject: [PATCH] fix: add _wstart if not exists

---
 source/libs/planner/src/planOptimizer.c | 27 ++++++++++++++++---------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/source/libs/planner/src/planOptimizer.c b/source/libs/planner/src/planOptimizer.c
index c3d46ed5e7..c9ea890574 100644
--- a/source/libs/planner/src/planOptimizer.c
+++ b/source/libs/planner/src/planOptimizer.c
@@ -1292,6 +1292,16 @@ static int32_t smaIndexOptFindSmaFunc(SNode* pQueryFunc, SNodeList* pSmaFuncs) {
   return -1;
 }
 
+static SNode* smaIndexOptFindWStartFunc(SNodeList* pSmaFuncs) {
+  SNode* pSmaFunc = NULL;
+  FOREACH(pSmaFunc, pSmaFuncs) {
+    if (QUERY_NODE_FUNCTION == nodeType(pSmaFunc) && FUNCTION_TYPE_WSTART == ((SFunctionNode*)pSmaFunc)->funcType) {
+      return pSmaFunc;
+    }
+  }
+  return NULL;
+}
+
 static int32_t smaIndexOptCreateSmaCols(SNodeList* pFuncs, uint64_t tableId, SNodeList* pSmaFuncs,
                                         SNodeList** pOutput) {
   SNodeList* pCols = NULL;
@@ -1310,14 +1320,8 @@ static int32_t smaIndexOptCreateSmaCols(SNodeList* pFuncs, uint64_t tableId, SNo
         break;
       }
       if (!hasWStart) {
-        SColumnNode* pTail = (SColumnNode*)pCols->pTail->pNode;
-        if (pTail->colId == PRIMARYKEY_TIMESTAMP_COL_ID) {
-          if (pTail->node.resType.type == TSDB_DATA_TYPE_TIMESTAMP) {
-            hasWStart = true;
-          } else {
-            nodesDestroyList(pCols);
-            return TSDB_CODE_APP_ERROR;
-          }
+        if (PRIMARYKEY_TIMESTAMP_COL_ID == ((SColumnNode*)pCols->pTail->pNode)->colId) {
+          hasWStart = true;
         }
       }
     }
@@ -1326,8 +1330,13 @@ static int32_t smaIndexOptCreateSmaCols(SNodeList* pFuncs, uint64_t tableId, SNo
 
   if (TSDB_CODE_SUCCESS == code && smaFuncIndex >= 0) {
     if (!hasWStart) {
+      SNode* pWsNode = smaIndexOptFindWStartFunc(pSmaFuncs);
+      if (!pWsNode) {
+        nodesDestroyList(pCols);
+        return TSDB_CODE_APP_ERROR;
+      }
       SExprNode exprNode;
-      exprNode.resType = ((SExprNode*)pSmaFuncs->pHead->pNode)->resType;
+      exprNode.resType = ((SExprNode*)pWsNode)->resType;
       sprintf(exprNode.aliasName, "#expr_%d", index + 1);
       SNode* pkNode = smaIndexOptCreateSmaCol((SNode*)&exprNode, tableId, PRIMARYKEY_TIMESTAMP_COL_ID);
       code = nodesListPushFront(pCols, pkNode);
-- 
GitLab