From bcac24b6b7ede099377b99cb85ca14e4bf53d848 Mon Sep 17 00:00:00 2001
From: kailixu <klxu@taosdata.com>
Date: Tue, 6 Jun 2023 17:19:59 +0800
Subject: [PATCH] fix: tsma query with order by _wstart/_wend

---
 source/libs/parser/src/parTranslater.c        |  1 +
 source/libs/planner/src/planOptimizer.c       | 23 +++++-
 .../script/tsim/sma/tsmaCreateInsertQuery.sim | 74 +++++++++++++++++++
 3 files changed, 95 insertions(+), 3 deletions(-)

diff --git a/source/libs/parser/src/parTranslater.c b/source/libs/parser/src/parTranslater.c
index d1c3da0041..a9fe65492d 100644
--- a/source/libs/parser/src/parTranslater.c
+++ b/source/libs/parser/src/parTranslater.c
@@ -4940,6 +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);
   TSWAP(pTable->pMeta, pInfo->pRollupTableMeta);
   *pOutput = (SNode*)pTable;
   return TSDB_CODE_SUCCESS;
diff --git a/source/libs/planner/src/planOptimizer.c b/source/libs/planner/src/planOptimizer.c
index 8b75fe6b33..36378a5414 100644
--- a/source/libs/planner/src/planOptimizer.c
+++ b/source/libs/planner/src/planOptimizer.c
@@ -1385,7 +1385,18 @@ static SNode* smaIndexOptFindWStartFunc(SNodeList* pSmaFuncs) {
   return NULL;
 }
 
-static int32_t smaIndexOptCreateSmaCols(SNodeList* pFuncs, uint64_t tableId, SNodeList* pSmaFuncs,
+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,
                                         SNodeList** pOutput) {
   SNodeList* pCols = NULL;
   SNode*     pFunc = NULL;
@@ -1393,11 +1404,16 @@ static int32_t smaIndexOptCreateSmaCols(SNodeList* pFuncs, uint64_t tableId, SNo
   int32_t    index = 0;
   int32_t    smaFuncIndex = -1;
   bool       hasWStart = false;
-  FOREACH(pFunc, pFuncs) {
+
+  SProjectLogicNode* pProject = (SProjectLogicNode*)pWindow->node.pParent;
+  FOREACH(pFunc, pWindow->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;
@@ -1444,10 +1460,11 @@ 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->pFuncs, pIndex->dstTbUid, pSmaFuncs, pCols);
+    code = smaIndexOptCreateSmaCols(pWindow, pIndex->dstTbUid, pSmaFuncs, pCols);
   }
   nodesDestroyList(pSmaFuncs);
   return code;
diff --git a/tests/script/tsim/sma/tsmaCreateInsertQuery.sim b/tests/script/tsim/sma/tsmaCreateInsertQuery.sim
index 242231e408..60f769d2ae 100644
--- a/tests/script/tsim/sma/tsmaCreateInsertQuery.sim
+++ b/tests/script/tsim/sma/tsmaCreateInsertQuery.sim
@@ -340,6 +340,80 @@ if $data05 != 30.000000000 then
   return -1
 endi
 
+print =============== select with _wstart/order by _wstart from stb from file in designated vgroup
+sql select _wstart, _wend, min(c1),max(c2),max(c1) from stb interval(5m,10s) sliding(5m) order by _wstart;
+print $data00 $data01 $data02 $data03 $data04
+if $rows != 1 then
+  print rows $rows != 1
+  return -1
+endi
+
+if $data02 != -13 then
+  print data02 $data02 != -13
+  return -1
+endi
+
+if $data03 != 20.00000 then
+  print data03 $data03 != 20.00000
+  return -1
+endi
+
+if $data04 != 20 then
+  print data04 $data04 != 20
+  return -1
+endi
+
+print =============== select without _wstart/with order by _wstart from stb from file in designated vgroup
+sql select _wend, min(c1),max(c2),max(c1) from stb interval(5m,10s) sliding(5m) order by _wstart;
+print $data00 $data01 $data02 $data03
+if $rows != 1 then
+  print rows $rows != 1
+  return -1
+endi
+
+if $data01 != -13 then
+  print data01 $data01 != -13
+  return -1
+endi
+
+if $data02 != 20.00000 then
+  print data02 $data02 != 20.00000
+  return -1
+endi
+
+if $data03 != 20 then
+  print data03 $data03 != 20
+  return -1
+endi
+
+print =============== select * from stb from file in common vgroups
+sql select _wstart, _wend, min(c1),max(c2),max(c1),max(c3) from stb interval(5m,10s) sliding(5m) order by _wstart;
+print $data00 $data01 $data02 $data03 $data04 $data05
+if $rows != 1 then
+  print rows $rows != 1
+  return -1
+endi
+
+if $data02 != -13 then
+  print data02 $data02 != -13
+  return -1
+endi
+
+if $data03 != 20.00000 then
+  print data03 $data03 != 20.00000
+  return -1
+endi
+
+if $data04 != 20 then
+  print data04 $data04 != 20
+  return -1
+endi
+
+if $data05 != 30.000000000 then
+  print data05 $data05 != 30.000000000
+  return -1
+endi
+
 system sh/exec.sh -n dnode1 -s stop -x SIGINT