Merge pull request #21620 from taosdata/fix/TD-24567-3.0

fix: tsma query with order by _wstart/_wend

source/libs/nodes/src/nodesUtilFuncs.c

@@ -1956,9 +1956,9 @@ static uint32_t funcNodeHash(const char* pKey, uint32_t len) {
 }
 
 static int32_t funcNodeEqual(const void* pLeft, const void* pRight, size_t len) {
-  if (0 != strcmp((*(const SExprNode**)pLeft)->aliasName, (*(const SExprNode**)pRight)->aliasName)) {
-    return 1;
-  }
+  // if (0 != strcmp((*(const SExprNode**)pLeft)->aliasName, (*(const SExprNode**)pRight)->aliasName)) {
+  //   return 1;
+  // }
   return nodesEqualNode(*(const SNode**)pLeft, *(const SNode**)pRight) ? 0 : 1;
 }
 

source/libs/parser/src/parTranslater.c

@@ -4979,6 +4979,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.tableAlias), "%s", pInfo->pTableName);
   TSWAP(pTable->pMeta, pInfo->pRollupTableMeta);
   *pOutput = (SNode*)pTable;
   return TSDB_CODE_SUCCESS;

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