From e0a5b2dd9df895a25053cf64ea04e018c8c7e07c Mon Sep 17 00:00:00 2001
From: 54liuyao <54liuyao>
Date: Mon, 8 Apr 2024 08:55:13 +0800
Subject: [PATCH] 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)