From 9a8d03f0ca34fefc0562a8c60ffa9d47a4d21c43 Mon Sep 17 00:00:00 2001
From: 54liuyao <54liuyao>
Date: Tue, 2 Apr 2024 14:03:02 +0800
Subject: [PATCH 1/7] adj last function

---
 source/libs/parser/src/parTranslater.c        |  4 ++--
 tests/script/tsim/parser/first_last_query.sim |  4 ++--
 tests/script/tsim/parser/join_multitables.sim | 16 ++++++-------
 tests/script/tsim/parser/last_cache_query.sim |  4 ++--
 tests/script/tsim/parser/lastrow2.sim         |  6 ++---
 tests/script/tsim/query/bi_star_table.sim     | 24 +++++++++----------
 tests/script/tsim/query/cache_last.sim        |  5 ++--
 .../system-test/2-query/last_and_last_row.py  |  4 ++--
 8 files changed, 34 insertions(+), 33 deletions(-)

diff --git a/source/libs/parser/src/parTranslater.c b/source/libs/parser/src/parTranslater.c
index 2110013310..1ea0ec8574 100644
--- a/source/libs/parser/src/parTranslater.c
+++ b/source/libs/parser/src/parTranslater.c
@@ -3368,9 +3368,9 @@ static int32_t createMultiResFuncsParas(STranslateContext* pCxt, SNodeList* pSrc
   SNode*     pPara = NULL;
   FOREACH(pPara, pSrcParas) {
     if (nodesIsStar(pPara)) {
-      code = createAllColumns(pCxt, true, &pExprs);
+      code = createAllColumns(pCxt, false, &pExprs);
     } else if (nodesIsTableStar(pPara)) {
-      code = createTableAllCols(pCxt, (SColumnNode*)pPara, true, &pExprs);
+      code = createTableAllCols(pCxt, (SColumnNode*)pPara, false, &pExprs);
     } else {
       code = nodesListMakeStrictAppend(&pExprs, nodesCloneNode(pPara));
     }
diff --git a/tests/script/tsim/parser/first_last_query.sim b/tests/script/tsim/parser/first_last_query.sim
index 533f59f4b2..8d02f817e3 100644
--- a/tests/script/tsim/parser/first_last_query.sim
+++ b/tests/script/tsim/parser/first_last_query.sim
@@ -298,7 +298,7 @@ if $data01 != 112 then
   return -1
 endi
 
-if $data02 != @tm0@ then
+if $data03 != @tm0@ then
   return -1
 endi
 
@@ -310,7 +310,7 @@ if $data11 != 421 then
   return -1
 endi
 
-if $data12 != @tm1@ then
+if $data13 != @tm1@ then
   return -1
 endi
 
diff --git a/tests/script/tsim/parser/join_multitables.sim b/tests/script/tsim/parser/join_multitables.sim
index d2f8ea4a88..59e41bc9d9 100644
--- a/tests/script/tsim/parser/join_multitables.sim
+++ b/tests/script/tsim/parser/join_multitables.sim
@@ -805,16 +805,16 @@ endi
 if $data04 != 01 then
   return -1
 endi
-if $data05 != @21-03-01 01:00:00.000@ then
+if $data[0][10] != @21-03-01 01:00:00.000@ then
   return -1
 endi
-if $data06 != 9911 then
+if $data[0][11] != 9911 then
   return -1
 endi
-if $data07 != 9911.000000000 then
+if $data[0][12] != 9911.000000000 then
   return -1
 endi
-if $data08 != 11 then
+if $data[0][13] != 11 then
   return -1
 endi
 
@@ -837,16 +837,16 @@ endi
 if $data04 != 05 then
   return -1
 endi
-if $data05 != @21-03-01 05:00:00.000@ then
+if $data[0][10] != @21-03-01 05:00:00.000@ then
   return -1
 endi
-if $data06 != 9915 then
+if $data[0][11] != 9915 then
   return -1
 endi
-if $data07 != 9915.000000000 then
+if $data[0][12] != 9915.000000000 then
   return -1
 endi
-if $data08 != 15 then
+if $data[0][13] != 15 then
   return -1
 endi
 
diff --git a/tests/script/tsim/parser/last_cache_query.sim b/tests/script/tsim/parser/last_cache_query.sim
index 30196e0b62..7bf6a51731 100644
--- a/tests/script/tsim/parser/last_cache_query.sim
+++ b/tests/script/tsim/parser/last_cache_query.sim
@@ -243,11 +243,11 @@ endi
 if $data04 != @70-01-01 07:59:57.000@ then
   return -1
 endi
-if $data05 != @21-05-12 10:10:12.000@ then
+if $data06 != @21-05-12 10:10:12.000@ then
   print $data00
   return -1
 endi
-if $data06 != @70-01-01 07:59:57.000@ then
+if $data07 != @70-01-01 07:59:57.000@ then
   return -1
 endi
 
diff --git a/tests/script/tsim/parser/lastrow2.sim b/tests/script/tsim/parser/lastrow2.sim
index 33267e3cfd..278de7ab49 100644
--- a/tests/script/tsim/parser/lastrow2.sim
+++ b/tests/script/tsim/parser/lastrow2.sim
@@ -54,13 +54,13 @@ sql select last_row(*), ts, 'abc', 123.981, tbname from m1
 if $rows != 1 then
   return -1
 endi
-if $data02 != @19-01-01 01:01:01.000@ then
+if $data03 != @19-01-01 01:01:01.000@ then
     return -1
 endi
-if $data03 != @abc@ then
+if $data04 != @abc@ then
     return -1
 endi
-if $data04 != 123.981000000 then
+if $data05 != 123.981000000 then
     print expect 123.981000000, actual: $data04
     return -1
 endi
diff --git a/tests/script/tsim/query/bi_star_table.sim b/tests/script/tsim/query/bi_star_table.sim
index 6bd6938678..1d71d6a68e 100644
--- a/tests/script/tsim/query/bi_star_table.sim
+++ b/tests/script/tsim/query/bi_star_table.sim
@@ -33,29 +33,29 @@ if $data06 != tba1 then
 endi
 
 sql select last(*) from db1.sta;
-if $cols != 4 then
+if $cols != 7 then
     return -1
 endi
 
-if $data03 != tba2 then
+if $data06 != tba2 then
     return -1
 endi
 
 sql select last_row(*) from db1.sta;
-if $cols != 4 then
+if $cols != 7 then
     return -1
 endi
 
-if $data03 != tba2 then
+if $data06 != tba2 then
     return -1
 endi
 
 sql select first(*) from db1.sta;
-if $cols != 4 then
+if $cols != 7 then
     return -1
 endi
 
-if $data03 != tba1 then
+if $data06 != tba1 then
     return -1
 endi
 
@@ -71,29 +71,29 @@ if $data06 != tba1 then
 endi
 
 sql select last(b.*) from db1.sta b;
-if $cols != 4 then
+if $cols != 7 then
     return -1
 endi
 
-if $data03 != tba2 then
+if $data06 != tba2 then
     return -1
 endi
 
 sql select last_row(b.*) from db1.sta b;
-if $cols != 4 then
+if $cols != 7 then
     return -1
 endi
 
-if $data03 != tba2 then
+if $data06 != tba2 then
     return -1
 endi
 
 sql select first(b.*) from db1.sta b;
-if $cols != 4 then
+if $cols != 7 then
     return -1
 endi
 
-if $data03 != tba1 then
+if $data06 != tba1 then
     return -1
 endi
 
diff --git a/tests/script/tsim/query/cache_last.sim b/tests/script/tsim/query/cache_last.sim
index 65eb46de69..f936f822a5 100644
--- a/tests/script/tsim/query/cache_last.sim
+++ b/tests/script/tsim/query/cache_last.sim
@@ -35,11 +35,12 @@ if $data03 != b then
   return -1
 endi
 sql explain select count(*), last(*) from sta;
-if $data00 != @-> Merge (columns=4 width=226 input_order=unknown output_order=unknown mode=column)@ then
+if $data00 != @-> Merge (columns=5 width=230 input_order=unknown output_order=unknown mode=column)@ then
+  print $data00
   return -1
 endi
 sql explain select first(f1), last(*) from sta;
-if $data00 != @-> Merge (columns=4 width=226 input_order=unknown output_order=unknown mode=column)@ then
+if $data00 != @-> Merge (columns=5 width=230 input_order=unknown output_order=unknown mode=column)@ then
   return -1
 endi
 sql select first(f1), last(*) from sta;
diff --git a/tests/system-test/2-query/last_and_last_row.py b/tests/system-test/2-query/last_and_last_row.py
index b04b3a75f3..ce25c3dd99 100644
--- a/tests/system-test/2-query/last_and_last_row.py
+++ b/tests/system-test/2-query/last_and_last_row.py
@@ -152,8 +152,8 @@ class TDTestCase:
         tdSql.checkRows(1)
         tdSql.checkData(0, 0, last_ts4)     
         tdSql.checkData(0, 1, 5 * maxRange - 1)  
-        tdSql.checkData(0, 2, last_ts4)    
-        tdSql.checkData(0, 3, 4 * maxRange + 1)
+        tdSql.checkData(0, 3, last_ts4)    
+        tdSql.checkData(0, 4, 4 * maxRange + 1)
 
         explain_res = self.explain_sql(sql)
         self.check_explain_res_no_row("Last Row Scan", explain_res, sql)

From 71ff0bcb843601ab6df73d97330925697197c1a5 Mon Sep 17 00:00:00 2001
From: 54liuyao <54liuyao>
Date: Tue, 2 Apr 2024 17:24:47 +0800
Subject: [PATCH 2/7] adj ci

---
 tests/script/tsim/parser/last_both_query.sim | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/script/tsim/parser/last_both_query.sim b/tests/script/tsim/parser/last_both_query.sim
index 5f86412199..1cfb2a316f 100644
--- a/tests/script/tsim/parser/last_both_query.sim
+++ b/tests/script/tsim/parser/last_both_query.sim
@@ -243,11 +243,11 @@ endi
 if $data04 != @70-01-01 07:59:57.000@ then
   return -1
 endi
-if $data05 != @21-05-12 10:10:12.000@ then
+if $data06 != @21-05-12 10:10:12.000@ then
   print $data00
   return -1
 endi
-if $data06 != @70-01-01 07:59:57.000@ then
+if $data07 != @70-01-01 07:59:57.000@ then
   return -1
 endi
 

From e0a5b2dd9df895a25053cf64ea04e018c8c7e07c Mon Sep 17 00:00:00 2001
From: 54liuyao <54liuyao>
Date: Mon, 8 Apr 2024 08:55:13 +0800
Subject: [PATCH 3/7] split last tag

---
 source/libs/planner/src/planOptimizer.c        | 12 +++++++++---
 tests/system-test/2-query/last_and_last_row.py | 12 ++++++------
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/source/libs/planner/src/planOptimizer.c b/source/libs/planner/src/planOptimizer.c
index 40e1d12a13..d322174fd0 100644
--- a/source/libs/planner/src/planOptimizer.c
+++ b/source/libs/planner/src/planOptimizer.c
@@ -2641,7 +2641,8 @@ static bool isNeedSplitCacheLastFunc(SFunctionNode* pFunc, SScanLogicNode* pScan
   int32_t funcType = pFunc->funcType;
   if ((FUNCTION_TYPE_LAST_ROW != funcType || (FUNCTION_TYPE_LAST_ROW == funcType && TSDB_CACHE_MODEL_LAST_VALUE == pScan->cacheLastMode)) &&
        (FUNCTION_TYPE_LAST != funcType || (FUNCTION_TYPE_LAST == funcType && (TSDB_CACHE_MODEL_LAST_ROW == pScan->cacheLastMode ||
-         QUERY_NODE_OPERATOR == nodeType(nodesListGetNode(pFunc->pParameterList, 0)) || QUERY_NODE_VALUE == nodeType(nodesListGetNode(pFunc->pParameterList, 0))))) &&
+         QUERY_NODE_OPERATOR == nodeType(nodesListGetNode(pFunc->pParameterList, 0)) || QUERY_NODE_VALUE == nodeType(nodesListGetNode(pFunc->pParameterList, 0)) ||
+         COLUMN_TYPE_COLUMN != ((SColumnNode*)nodesListGetNode(pFunc->pParameterList, 0))->colType))) &&
         FUNCTION_TYPE_SELECT_VALUE != funcType && FUNCTION_TYPE_GROUP_KEY != funcType) {
     return true;
   }
@@ -2661,8 +2662,9 @@ static bool lastRowScanOptCheckFuncList(SLogicNode* pNode, int8_t cacheLastModel
     if (FUNCTION_TYPE_LAST == pAggFunc->funcType) {
       if (QUERY_NODE_COLUMN == nodeType(pParam)) {
         SColumnNode* pCol = (SColumnNode*)pParam;
-        if (pCol->colType != COLUMN_TYPE_COLUMN) {
-          return false;
+        if (pCol->colType != COLUMN_TYPE_COLUMN && TSDB_CACHE_MODEL_LAST_ROW != cacheLastModel) {
+          needSplitFuncCount++;
+          *hasOtherFunc = true;
         }
         if (lastColId != pCol->colId) {
           lastColId = pCol->colId;
@@ -3070,6 +3072,10 @@ static int32_t splitCacheLastFuncOptCreateAggLogicNode(SAggLogicNode** pNewAgg,
     if (TSDB_CODE_SUCCESS != code) {
       return code;
     }
+    code = nodesCollectColumnsFromNode((SNode*)list, NULL, COLLECT_COL_TYPE_TAG, &pScan->pScanPseudoCols);
+    if (TSDB_CODE_SUCCESS != code) {
+      return code;
+    }
     nodesFree(list);
     bool found = false;
     FOREACH(pNode, pScan->pScanCols) {
diff --git a/tests/system-test/2-query/last_and_last_row.py b/tests/system-test/2-query/last_and_last_row.py
index ce25c3dd99..cd572b05cb 100644
--- a/tests/system-test/2-query/last_and_last_row.py
+++ b/tests/system-test/2-query/last_and_last_row.py
@@ -302,8 +302,8 @@ class TDTestCase:
         tdSql.checkRows(1)
         tdSql.checkData(0, 0, last_ts4)     
         tdSql.checkData(0, 1, 5 * maxRange - 1)  
-        tdSql.checkData(0, 2, last_ts4)    
-        tdSql.checkData(0, 3, 4 * maxRange + 1)
+        tdSql.checkData(0, 3, last_ts4)    
+        tdSql.checkData(0, 4, 4 * maxRange + 1)
 
         explain_res = self.explain_sql(sql)
         self.check_explain_res_has_row("Last Row Scan", explain_res, sql)
@@ -453,8 +453,8 @@ class TDTestCase:
         tdSql.checkRows(1)
         tdSql.checkData(0, 0, last_ts4)     
         tdSql.checkData(0, 1, 5 * maxRange - 1)  
-        tdSql.checkData(0, 2, last_ts4)    
-        tdSql.checkData(0, 3, 4 * maxRange + 1)
+        tdSql.checkData(0, 3, last_ts4)    
+        tdSql.checkData(0, 4, 4 * maxRange + 1)
 
         explain_res = self.explain_sql(sql)
         self.check_explain_res_has_row("Last Row Scan", explain_res, sql)
@@ -587,7 +587,7 @@ class TDTestCase:
 
         explain_res = self.explain_sql(sql)
         self.check_explain_res_has_row("Last Row Scan", explain_res, sql)
-        self.check_explain_res_no_row("Table Scan", explain_res, sql)
+        self.check_explain_res_has_row("Table Scan", explain_res, sql)
         
         sql = f'select last_row(ts), last(ts), last_row(id), last(id) from last_test_both_model.st;'
         tdSql.query(sql)
@@ -607,7 +607,7 @@ class TDTestCase:
         tdSql.checkData(0, 0, last_ts4)     
         tdSql.checkData(0, 1, 5 * maxRange - 1)  
         #tdSql.checkData(0, 2, last_ts4)   
-        tdSql.checkData(0, 3, 4 * maxRange + 1)
+        tdSql.checkData(0, 4, 4 * maxRange + 1)
 
         explain_res = self.explain_sql(sql)
         self.check_explain_res_has_row("Last Row Scan", explain_res, sql)

From 0f6e87b3c931c7af219c5099f68679d90ae2798c Mon Sep 17 00:00:00 2001
From: 54liuyao <54liuyao>
Date: Tue, 9 Apr 2024 14:53:50 +0800
Subject: [PATCH 4/7] add tag for last row

---
 source/libs/planner/src/planOptimizer.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/source/libs/planner/src/planOptimizer.c b/source/libs/planner/src/planOptimizer.c
index d322174fd0..0cc6a5057d 100644
--- a/source/libs/planner/src/planOptimizer.c
+++ b/source/libs/planner/src/planOptimizer.c
@@ -2943,6 +2943,13 @@ static int32_t lastRowScanOptimize(SOptimizeContext* pCxt, SLogicSubplan* pLogic
               }
             }
           }
+          FOREACH(pColNode, pScan->pScanPseudoCols) {
+            if (nodesEqualNode(pParamNode, pColNode)) {
+              if (funcType != FUNCTION_TYPE_LAST) {
+                nodesListMakeAppend(&pLastRowCols, nodesCloneNode(pColNode));
+              }
+            }
+          }
         }
       }
 

From 20efb35c6edcbf9a8066157bc0680472d5a625de Mon Sep 17 00:00:00 2001
From: 54liuyao <54liuyao>
Date: Tue, 9 Apr 2024 19:09:20 +0800
Subject: [PATCH 5/7] add tag for split plan

---
 source/libs/planner/src/planOptimizer.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/source/libs/planner/src/planOptimizer.c b/source/libs/planner/src/planOptimizer.c
index 0cc6a5057d..1eaa37cc03 100644
--- a/source/libs/planner/src/planOptimizer.c
+++ b/source/libs/planner/src/planOptimizer.c
@@ -3104,6 +3104,10 @@ static int32_t splitCacheLastFuncOptCreateAggLogicNode(SAggLogicNode** pNewAgg,
     if (TSDB_CODE_SUCCESS != code) {
       return code;
     }
+    code = createColumnByRewriteExprs(pScan->pScanPseudoCols, &pScan->node.pTargets);
+    if (TSDB_CODE_SUCCESS != code) {
+      return code;
+    }
     OPTIMIZE_FLAG_CLEAR_MASK(pScan->node.optimizedFlag, OPTIMIZE_FLAG_SCAN_PATH);
   }
 

From af97f9e0007938bd94db517331c6ed7496a25d4d Mon Sep 17 00:00:00 2001
From: 54liuyao <54liuyao>
Date: Thu, 11 Apr 2024 16:48:58 +0800
Subject: [PATCH 6/7] add config

---
 include/common/tglobal.h                      |  1 +
 source/common/src/tglobal.c                   |  8 ++++++-
 source/libs/parser/src/parTranslater.c        |  4 ++--
 tests/script/tsim/parser/first_last_query.sim |  4 ++--
 tests/script/tsim/parser/join_multitables.sim | 16 ++++++-------
 tests/script/tsim/parser/last_both_query.sim  |  4 ++--
 tests/script/tsim/parser/last_cache_query.sim |  4 ++--
 tests/script/tsim/parser/lastrow2.sim         |  6 ++---
 tests/script/tsim/query/bi_star_table.sim     | 24 +++++++++----------
 tests/script/tsim/query/cache_last.sim        |  5 ++--
 .../system-test/2-query/last_and_last_row.py  | 16 ++++++-------
 11 files changed, 49 insertions(+), 43 deletions(-)

diff --git a/include/common/tglobal.h b/include/common/tglobal.h
index 7a7f19c3af..e04488a68c 100644
--- a/include/common/tglobal.h
+++ b/include/common/tglobal.h
@@ -158,6 +158,7 @@ extern int32_t tsMetaCacheMaxSize;
 extern int32_t tsSlowLogThreshold;
 extern int32_t tsSlowLogScope;
 extern int32_t tsTimeSeriesThreshold;
+extern bool    tsMultiResultFunctionStarReturnTags;
 
 // client
 extern int32_t tsMinSlidingTime;
diff --git a/source/common/src/tglobal.c b/source/common/src/tglobal.c
index 3381d52050..dae86f1a32 100644
--- a/source/common/src/tglobal.c
+++ b/source/common/src/tglobal.c
@@ -170,6 +170,7 @@ int32_t tsMetaCacheMaxSize = -1;  // MB
 int32_t tsSlowLogThreshold = 3;   // seconds
 int32_t tsSlowLogScope = SLOW_LOG_TYPE_ALL;
 int32_t tsTimeSeriesThreshold = 50;
+bool    tsMultiResultFunctionStarReturnTags = false;
 
 /*
  * denote if the server needs to compress response message at the application layer to client, including query rsp,
@@ -545,6 +546,8 @@ static int32_t taosAddClientCfg(SConfig *pCfg) {
 
   if (cfgAddBool(pCfg, "monitor", tsEnableMonitor, CFG_SCOPE_BOTH, CFG_DYN_BOTH) != 0) return -1;
   if (cfgAddInt32(pCfg, "monitorInterval", tsMonitorInterval, 1, 200000, CFG_SCOPE_BOTH, CFG_DYN_NONE) != 0) return -1;
+
+  if (cfgAddBool(pCfg, "multiResultFunctionStarReturnTags", tsMultiResultFunctionStarReturnTags, CFG_SCOPE_CLIENT, CFG_DYN_CLIENT) != 0) return -1;
   return 0;
 }
 
@@ -1103,6 +1106,8 @@ static int32_t taosSetClientCfg(SConfig *pCfg) {
   tsKeepAliveIdle = cfgGetItem(pCfg, "keepAliveIdle")->i32;
 
   tsExperimental = cfgGetItem(pCfg, "experimental")->bval;
+
+  tsMultiResultFunctionStarReturnTags = cfgGetItem(pCfg, "multiResultFunctionStarReturnTags")->bval;
   return 0;
 }
 
@@ -1742,7 +1747,8 @@ static int32_t taosCfgDynamicOptionsForClient(SConfig *pCfg, char *name) {
                                          {"shellActivityTimer", &tsShellActivityTimer},
                                          {"slowLogThreshold", &tsSlowLogThreshold},
                                          {"useAdapter", &tsUseAdapter},
-                                         {"experimental", &tsExperimental}};
+                                         {"experimental", &tsExperimental},
+                                         {"multiResultFunctionStarReturnTags", &tsMultiResultFunctionStarReturnTags} };
 
     if (taosCfgSetOption(debugOptions, tListLen(debugOptions), pItem, true) != 0) {
       taosCfgSetOption(options, tListLen(options), pItem, false);
diff --git a/source/libs/parser/src/parTranslater.c b/source/libs/parser/src/parTranslater.c
index 1ea0ec8574..778c9b1590 100644
--- a/source/libs/parser/src/parTranslater.c
+++ b/source/libs/parser/src/parTranslater.c
@@ -3368,9 +3368,9 @@ static int32_t createMultiResFuncsParas(STranslateContext* pCxt, SNodeList* pSrc
   SNode*     pPara = NULL;
   FOREACH(pPara, pSrcParas) {
     if (nodesIsStar(pPara)) {
-      code = createAllColumns(pCxt, false, &pExprs);
+      code = createAllColumns(pCxt, !tsMultiResultFunctionStarReturnTags, &pExprs);
     } else if (nodesIsTableStar(pPara)) {
-      code = createTableAllCols(pCxt, (SColumnNode*)pPara, false, &pExprs);
+      code = createTableAllCols(pCxt, (SColumnNode*)pPara, !tsMultiResultFunctionStarReturnTags, &pExprs);
     } else {
       code = nodesListMakeStrictAppend(&pExprs, nodesCloneNode(pPara));
     }
diff --git a/tests/script/tsim/parser/first_last_query.sim b/tests/script/tsim/parser/first_last_query.sim
index 8d02f817e3..533f59f4b2 100644
--- a/tests/script/tsim/parser/first_last_query.sim
+++ b/tests/script/tsim/parser/first_last_query.sim
@@ -298,7 +298,7 @@ if $data01 != 112 then
   return -1
 endi
 
-if $data03 != @tm0@ then
+if $data02 != @tm0@ then
   return -1
 endi
 
@@ -310,7 +310,7 @@ if $data11 != 421 then
   return -1
 endi
 
-if $data13 != @tm1@ then
+if $data12 != @tm1@ then
   return -1
 endi
 
diff --git a/tests/script/tsim/parser/join_multitables.sim b/tests/script/tsim/parser/join_multitables.sim
index 59e41bc9d9..d2f8ea4a88 100644
--- a/tests/script/tsim/parser/join_multitables.sim
+++ b/tests/script/tsim/parser/join_multitables.sim
@@ -805,16 +805,16 @@ endi
 if $data04 != 01 then
   return -1
 endi
-if $data[0][10] != @21-03-01 01:00:00.000@ then
+if $data05 != @21-03-01 01:00:00.000@ then
   return -1
 endi
-if $data[0][11] != 9911 then
+if $data06 != 9911 then
   return -1
 endi
-if $data[0][12] != 9911.000000000 then
+if $data07 != 9911.000000000 then
   return -1
 endi
-if $data[0][13] != 11 then
+if $data08 != 11 then
   return -1
 endi
 
@@ -837,16 +837,16 @@ endi
 if $data04 != 05 then
   return -1
 endi
-if $data[0][10] != @21-03-01 05:00:00.000@ then
+if $data05 != @21-03-01 05:00:00.000@ then
   return -1
 endi
-if $data[0][11] != 9915 then
+if $data06 != 9915 then
   return -1
 endi
-if $data[0][12] != 9915.000000000 then
+if $data07 != 9915.000000000 then
   return -1
 endi
-if $data[0][13] != 15 then
+if $data08 != 15 then
   return -1
 endi
 
diff --git a/tests/script/tsim/parser/last_both_query.sim b/tests/script/tsim/parser/last_both_query.sim
index 1cfb2a316f..5f86412199 100644
--- a/tests/script/tsim/parser/last_both_query.sim
+++ b/tests/script/tsim/parser/last_both_query.sim
@@ -243,11 +243,11 @@ endi
 if $data04 != @70-01-01 07:59:57.000@ then
   return -1
 endi
-if $data06 != @21-05-12 10:10:12.000@ then
+if $data05 != @21-05-12 10:10:12.000@ then
   print $data00
   return -1
 endi
-if $data07 != @70-01-01 07:59:57.000@ then
+if $data06 != @70-01-01 07:59:57.000@ then
   return -1
 endi
 
diff --git a/tests/script/tsim/parser/last_cache_query.sim b/tests/script/tsim/parser/last_cache_query.sim
index 7bf6a51731..30196e0b62 100644
--- a/tests/script/tsim/parser/last_cache_query.sim
+++ b/tests/script/tsim/parser/last_cache_query.sim
@@ -243,11 +243,11 @@ endi
 if $data04 != @70-01-01 07:59:57.000@ then
   return -1
 endi
-if $data06 != @21-05-12 10:10:12.000@ then
+if $data05 != @21-05-12 10:10:12.000@ then
   print $data00
   return -1
 endi
-if $data07 != @70-01-01 07:59:57.000@ then
+if $data06 != @70-01-01 07:59:57.000@ then
   return -1
 endi
 
diff --git a/tests/script/tsim/parser/lastrow2.sim b/tests/script/tsim/parser/lastrow2.sim
index 278de7ab49..33267e3cfd 100644
--- a/tests/script/tsim/parser/lastrow2.sim
+++ b/tests/script/tsim/parser/lastrow2.sim
@@ -54,13 +54,13 @@ sql select last_row(*), ts, 'abc', 123.981, tbname from m1
 if $rows != 1 then
   return -1
 endi
-if $data03 != @19-01-01 01:01:01.000@ then
+if $data02 != @19-01-01 01:01:01.000@ then
     return -1
 endi
-if $data04 != @abc@ then
+if $data03 != @abc@ then
     return -1
 endi
-if $data05 != 123.981000000 then
+if $data04 != 123.981000000 then
     print expect 123.981000000, actual: $data04
     return -1
 endi
diff --git a/tests/script/tsim/query/bi_star_table.sim b/tests/script/tsim/query/bi_star_table.sim
index 1d71d6a68e..6bd6938678 100644
--- a/tests/script/tsim/query/bi_star_table.sim
+++ b/tests/script/tsim/query/bi_star_table.sim
@@ -33,29 +33,29 @@ if $data06 != tba1 then
 endi
 
 sql select last(*) from db1.sta;
-if $cols != 7 then
+if $cols != 4 then
     return -1
 endi
 
-if $data06 != tba2 then
+if $data03 != tba2 then
     return -1
 endi
 
 sql select last_row(*) from db1.sta;
-if $cols != 7 then
+if $cols != 4 then
     return -1
 endi
 
-if $data06 != tba2 then
+if $data03 != tba2 then
     return -1
 endi
 
 sql select first(*) from db1.sta;
-if $cols != 7 then
+if $cols != 4 then
     return -1
 endi
 
-if $data06 != tba1 then
+if $data03 != tba1 then
     return -1
 endi
 
@@ -71,29 +71,29 @@ if $data06 != tba1 then
 endi
 
 sql select last(b.*) from db1.sta b;
-if $cols != 7 then
+if $cols != 4 then
     return -1
 endi
 
-if $data06 != tba2 then
+if $data03 != tba2 then
     return -1
 endi
 
 sql select last_row(b.*) from db1.sta b;
-if $cols != 7 then
+if $cols != 4 then
     return -1
 endi
 
-if $data06 != tba2 then
+if $data03 != tba2 then
     return -1
 endi
 
 sql select first(b.*) from db1.sta b;
-if $cols != 7 then
+if $cols != 4 then
     return -1
 endi
 
-if $data06 != tba1 then
+if $data03 != tba1 then
     return -1
 endi
 
diff --git a/tests/script/tsim/query/cache_last.sim b/tests/script/tsim/query/cache_last.sim
index f936f822a5..65eb46de69 100644
--- a/tests/script/tsim/query/cache_last.sim
+++ b/tests/script/tsim/query/cache_last.sim
@@ -35,12 +35,11 @@ if $data03 != b then
   return -1
 endi
 sql explain select count(*), last(*) from sta;
-if $data00 != @-> Merge (columns=5 width=230 input_order=unknown output_order=unknown mode=column)@ then
-  print $data00
+if $data00 != @-> Merge (columns=4 width=226 input_order=unknown output_order=unknown mode=column)@ then
   return -1
 endi
 sql explain select first(f1), last(*) from sta;
-if $data00 != @-> Merge (columns=5 width=230 input_order=unknown output_order=unknown mode=column)@ then
+if $data00 != @-> Merge (columns=4 width=226 input_order=unknown output_order=unknown mode=column)@ then
   return -1
 endi
 sql select first(f1), last(*) from sta;
diff --git a/tests/system-test/2-query/last_and_last_row.py b/tests/system-test/2-query/last_and_last_row.py
index cd572b05cb..b04b3a75f3 100644
--- a/tests/system-test/2-query/last_and_last_row.py
+++ b/tests/system-test/2-query/last_and_last_row.py
@@ -152,8 +152,8 @@ class TDTestCase:
         tdSql.checkRows(1)
         tdSql.checkData(0, 0, last_ts4)     
         tdSql.checkData(0, 1, 5 * maxRange - 1)  
-        tdSql.checkData(0, 3, last_ts4)    
-        tdSql.checkData(0, 4, 4 * maxRange + 1)
+        tdSql.checkData(0, 2, last_ts4)    
+        tdSql.checkData(0, 3, 4 * maxRange + 1)
 
         explain_res = self.explain_sql(sql)
         self.check_explain_res_no_row("Last Row Scan", explain_res, sql)
@@ -302,8 +302,8 @@ class TDTestCase:
         tdSql.checkRows(1)
         tdSql.checkData(0, 0, last_ts4)     
         tdSql.checkData(0, 1, 5 * maxRange - 1)  
-        tdSql.checkData(0, 3, last_ts4)    
-        tdSql.checkData(0, 4, 4 * maxRange + 1)
+        tdSql.checkData(0, 2, last_ts4)    
+        tdSql.checkData(0, 3, 4 * maxRange + 1)
 
         explain_res = self.explain_sql(sql)
         self.check_explain_res_has_row("Last Row Scan", explain_res, sql)
@@ -453,8 +453,8 @@ class TDTestCase:
         tdSql.checkRows(1)
         tdSql.checkData(0, 0, last_ts4)     
         tdSql.checkData(0, 1, 5 * maxRange - 1)  
-        tdSql.checkData(0, 3, last_ts4)    
-        tdSql.checkData(0, 4, 4 * maxRange + 1)
+        tdSql.checkData(0, 2, last_ts4)    
+        tdSql.checkData(0, 3, 4 * maxRange + 1)
 
         explain_res = self.explain_sql(sql)
         self.check_explain_res_has_row("Last Row Scan", explain_res, sql)
@@ -587,7 +587,7 @@ class TDTestCase:
 
         explain_res = self.explain_sql(sql)
         self.check_explain_res_has_row("Last Row Scan", explain_res, sql)
-        self.check_explain_res_has_row("Table Scan", explain_res, sql)
+        self.check_explain_res_no_row("Table Scan", explain_res, sql)
         
         sql = f'select last_row(ts), last(ts), last_row(id), last(id) from last_test_both_model.st;'
         tdSql.query(sql)
@@ -607,7 +607,7 @@ class TDTestCase:
         tdSql.checkData(0, 0, last_ts4)     
         tdSql.checkData(0, 1, 5 * maxRange - 1)  
         #tdSql.checkData(0, 2, last_ts4)   
-        tdSql.checkData(0, 4, 4 * maxRange + 1)
+        tdSql.checkData(0, 3, 4 * maxRange + 1)
 
         explain_res = self.explain_sql(sql)
         self.check_explain_res_has_row("Last Row Scan", explain_res, sql)

From d4ebd2ec71cb7a1cb10928d95baada6c7bd132ee Mon Sep 17 00:00:00 2001
From: 54liuyao <54liuyao>
Date: Thu, 11 Apr 2024 18:16:24 +0800
Subject: [PATCH 7/7] add ci

---
 tests/script/tsim/query/cache_last_tag.sim | 189 +++++++++++++++++++++
 1 file changed, 189 insertions(+)
 create mode 100644 tests/script/tsim/query/cache_last_tag.sim

diff --git a/tests/script/tsim/query/cache_last_tag.sim b/tests/script/tsim/query/cache_last_tag.sim
new file mode 100644
index 0000000000..458254625f
--- /dev/null
+++ b/tests/script/tsim/query/cache_last_tag.sim
@@ -0,0 +1,189 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/exec.sh -n dnode1 -s start
+sql connect
+
+sql alter local "multiResultFunctionStarReturnTags" "0";
+
+print step1=====================
+sql drop database if exists test;
+sql create database test  vgroups 4 CACHEMODEL 'both';
+sql use test;
+sql create stable st(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create table t1 using st tags(1,1,1);
+sql create table t2 using st tags(2,2,2);
+sql create table t3 using st tags(3,3,3);
+sql create table t4 using st tags(NULL,4,4);
+
+sql insert into t1 values(1648791211000,1,1,1);
+sql insert into t1 values(1648791211001,2,2,2);
+sql insert into t2 values(1648791211002,3,3,3);
+sql insert into t2 values(1648791211003,4,4,4);
+sql insert into t3 values(1648791211004,5,5,5);
+sql insert into t3 values(1648791211005,6,6,6);
+sql insert into t4 values(1648791211007,NULL,NULL,NULL);
+
+sql select last(*),last_row(*) from st;
+
+if $cols != 8 then
+  print ======cols=$cols
+  return -1
+endi
+
+sql alter local "multiResultFunctionStarReturnTags" "1";
+
+sql select last(*),last_row(*) from st;
+
+if $cols != 14 then
+  print ======cols=$cols
+  return -1
+endi
+
+sql select last(*) from st;
+
+if $cols != 7 then
+  return -1
+endi
+
+sql select last_row(*) from st;
+
+if $cols != 7 then
+  return -1
+endi
+
+sql select last(*),last_row(*) from t1;
+
+if $cols != 8 then
+  return -1
+endi
+
+print step2=====================
+
+sql drop database if exists test1;
+sql create database test1  vgroups 4 CACHEMODEL 'last_row';
+sql use test1;
+sql create stable st(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create table t1 using st tags(1,1,1);
+sql create table t2 using st tags(2,2,2);
+sql create table t3 using st tags(3,3,3);
+sql create table t4 using st tags(NULL,4,4);
+
+sql insert into t1 values(1648791211000,1,1,1);
+sql insert into t1 values(1648791211001,2,2,2);
+sql insert into t2 values(1648791211002,3,3,3);
+sql insert into t2 values(1648791211003,4,4,4);
+sql insert into t3 values(1648791211004,5,5,5);
+sql insert into t3 values(1648791211005,6,6,6);
+sql insert into t4 values(1648791211007,NULL,NULL,NULL);
+
+sql select last(*),last_row(*) from st;
+
+if $cols != 14 then
+  return -1
+endi
+
+sql select last(*) from st;
+
+if $cols != 7 then
+  return -1
+endi
+
+return -1
+
+sql select last_row(*) from st;
+
+if $cols != 7 then
+  return -1
+endi
+
+sql select last(*),last_row(*) from t1;
+
+if $cols != 8 then
+  return -1
+endi
+
+print step3=====================
+
+sql drop database if exists test2;
+sql create database test2  vgroups 4 CACHEMODEL 'last_value';
+sql use test2;
+sql create stable st(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create table t1 using st tags(1,1,1);
+sql create table t2 using st tags(2,2,2);
+sql create table t3 using st tags(3,3,3);
+sql create table t4 using st tags(NULL,4,4);
+
+sql insert into t1 values(1648791211000,1,1,1);
+sql insert into t1 values(1648791211001,2,2,2);
+sql insert into t2 values(1648791211002,3,3,3);
+sql insert into t2 values(1648791211003,4,4,4);
+sql insert into t3 values(1648791211004,5,5,5);
+sql insert into t3 values(1648791211005,6,6,6);
+sql insert into t4 values(1648791211007,NULL,NULL,NULL);
+
+sql select last(*),last_row(*) from st;
+
+if $cols != 14 then
+  return -1
+endi
+
+sql select last(*) from st;
+
+if $cols != 7 then
+  return -1
+endi
+
+sql select last_row(*) from st;
+
+if $cols != 7 then
+  return -1
+endi
+
+sql select last(*),last_row(*) from t1;
+
+if $cols != 8 then
+  return -1
+endi
+
+sql drop database if exists test4;
+sql create database test4  vgroups 4;
+sql use test4;
+sql create stable st(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create table t1 using st tags(1,1,1);
+sql create table t2 using st tags(2,2,2);
+sql create table t3 using st tags(3,3,3);
+sql create table t4 using st tags(NULL,4,4);
+
+sql insert into t1 values(1648791211000,1,1,1);
+sql insert into t1 values(1648791211001,2,2,2);
+sql insert into t2 values(1648791211002,3,3,3);
+sql insert into t2 values(1648791211003,4,4,4);
+sql insert into t3 values(1648791211004,5,5,5);
+sql insert into t3 values(1648791211005,6,6,6);
+sql insert into t4 values(1648791211007,NULL,NULL,NULL);
+
+sql select last(*),last_row(*) from st;
+
+if $cols != 14 then
+  return -1
+endi
+
+sql select last(*) from st;
+
+if $cols != 7 then
+  return -1
+endi
+
+sql select last_row(*) from st;
+
+if $cols != 7 then
+  return -1
+endi
+
+sql select last(*),last_row(*) from t1;
+
+if $cols != 8 then
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT