From 576e3d1156ae9a529e6a305d7f712e6a04dabea0 Mon Sep 17 00:00:00 2001
From: kailixu <klxu@taosdata.com>
Date: Thu, 8 Jun 2023 11:49:49 +0800
Subject: [PATCH] chore: erase duplicated func node for window logic node

---
 source/libs/parser/src/parTranslater.c     |  2 +-
 source/libs/planner/src/planLogicCreater.c | 19 ++++++++++++++++++
 source/libs/planner/src/planOptimizer.c    | 23 +++-------------------
 3 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/source/libs/parser/src/parTranslater.c b/source/libs/parser/src/parTranslater.c
index a9fe65492d..9f94c7cb8c 100644
--- a/source/libs/parser/src/parTranslater.c
+++ b/source/libs/parser/src/parTranslater.c
@@ -4940,7 +4940,7 @@ static int32_t buildTableForSampleAst(SSampleAstInfo* pInfo, SNode** pOutput) {
   }
   snprintf(pTable->table.dbName, sizeof(pTable->table.dbName), "%s", pInfo->pDbName);
   snprintf(pTable->table.tableName, sizeof(pTable->table.tableName), "%s", pInfo->pTableName);
-  snprintf(pTable->table.tableAlias, sizeof(pTable->table.tableName), "%s", pInfo->pTableName);
+  snprintf(pTable->table.tableAlias, sizeof(pTable->table.tableAlias), "%s", pInfo->pTableName);
   TSWAP(pTable->pMeta, pInfo->pRollupTableMeta);
   *pOutput = (SNode*)pTable;
   return TSDB_CODE_SUCCESS;
diff --git a/source/libs/planner/src/planLogicCreater.c b/source/libs/planner/src/planLogicCreater.c
index 5bbc9acdad..8c30beffc9 100644
--- a/source/libs/planner/src/planLogicCreater.c
+++ b/source/libs/planner/src/planLogicCreater.c
@@ -749,6 +749,25 @@ static int32_t createWindowLogicNodeFinalize(SLogicPlanContext* pCxt, SSelectStm
     code = rewriteExprsForSelect(pWindow->pFuncs, pSelect, SQL_CLAUSE_WINDOW, NULL);
   }
 
+  // erase duplicated funcNode by filtering colNode in pSelect->pProjectionList
+  int32_t funcIndex = 0;
+  SNode * pFunc = NULL, *pProject = NULL;
+  FOREACH(pFunc, pWindow->pFuncs) {
+    bool exist = false;
+    FOREACH(pProject, pSelect->pProjectionList) {
+      if (0 != ((SFunctionNode*)pFunc)->node.aliasName[0] &&
+          0 == strncmp(((SFunctionNode*)pFunc)->node.aliasName, ((SColumnNode*)pProject)->colName, TSDB_COL_NAME_LEN)) {
+        exist = true;
+        break;
+      }
+    }
+    if (!exist) {
+      nodesListErase(pWindow->pFuncs,  nodesListGetCell(pWindow->pFuncs, funcIndex));
+    } else {
+      ++funcIndex;
+    }
+  }
+
   if (TSDB_CODE_SUCCESS == code) {
     code = createColumnByRewriteExprs(pWindow->pFuncs, &pWindow->node.pTargets);
   }
diff --git a/source/libs/planner/src/planOptimizer.c b/source/libs/planner/src/planOptimizer.c
index 36378a5414..8b75fe6b33 100644
--- a/source/libs/planner/src/planOptimizer.c
+++ b/source/libs/planner/src/planOptimizer.c
@@ -1385,18 +1385,7 @@ static SNode* smaIndexOptFindWStartFunc(SNodeList* pSmaFuncs) {
   return NULL;
 }
 
-static SNode* smaIndexOptFuncInProject(SNodeList* pProjects, SFunctionNode* pFunc) {
-  SNode* pProject = NULL;
-  FOREACH(pProject, pProjects) {
-    if (0 != pFunc->node.aliasName[0] &&
-        0 == strncmp(pFunc->node.aliasName, ((SColumnNode*)pProject)->colName, TSDB_COL_NAME_LEN)) {
-      return pProject;
-    }
-  }
-  return NULL;
-}
-
-static int32_t smaIndexOptCreateSmaCols(SWindowLogicNode* pWindow, uint64_t tableId, SNodeList* pSmaFuncs,
+static int32_t smaIndexOptCreateSmaCols(SNodeList* pFuncs, uint64_t tableId, SNodeList* pSmaFuncs,
                                         SNodeList** pOutput) {
   SNodeList* pCols = NULL;
   SNode*     pFunc = NULL;
@@ -1404,16 +1393,11 @@ static int32_t smaIndexOptCreateSmaCols(SWindowLogicNode* pWindow, uint64_t tabl
   int32_t    index = 0;
   int32_t    smaFuncIndex = -1;
   bool       hasWStart = false;
-
-  SProjectLogicNode* pProject = (SProjectLogicNode*)pWindow->node.pParent;
-  FOREACH(pFunc, pWindow->pFuncs) {
+  FOREACH(pFunc, pFuncs) {
     smaFuncIndex = smaIndexOptFindSmaFunc(pFunc, pSmaFuncs);
     if (smaFuncIndex < 0) {
       break;
     } else {
-      if (pProject && !smaIndexOptFuncInProject(pProject->pProjections, (SFunctionNode*)pFunc)) {
-        continue;
-      }
       code = nodesListMakeStrictAppend(&pCols, smaIndexOptCreateSmaCol(pFunc, tableId, smaFuncIndex + 1));
       if (TSDB_CODE_SUCCESS != code) {
         break;
@@ -1460,11 +1444,10 @@ static int32_t smaIndexOptCouldApplyIndex(SScanLogicNode* pScan, STableIndexInfo
   if (!smaIndexOptEqualInterval(pScan, pWindow, pIndex)) {
     return TSDB_CODE_SUCCESS;
   }
-
   SNodeList* pSmaFuncs = NULL;
   int32_t    code = nodesStringToList(pIndex->expr, &pSmaFuncs);
   if (TSDB_CODE_SUCCESS == code) {
-    code = smaIndexOptCreateSmaCols(pWindow, pIndex->dstTbUid, pSmaFuncs, pCols);
+    code = smaIndexOptCreateSmaCols(pWindow->pFuncs, pIndex->dstTbUid, pSmaFuncs, pCols);
   }
   nodesDestroyList(pSmaFuncs);
   return code;