From de801080e10f9dd579e79570ad2109b24f489c36 Mon Sep 17 00:00:00 2001
From: factosea <285808407@qq.com>
Date: Fri, 27 Dec 2024 20:08:21 +0800
Subject: [PATCH] enh: cols func

---
 source/libs/function/src/builtins.c        | 3 +++
 source/libs/function/src/builtinsimpl.c    | 2 +-
 source/libs/parser/src/parTranslater.c     | 4 ++++
 source/libs/planner/src/planLogicCreater.c | 3 +++
 source/libs/planner/src/planOptimizer.c    | 7 ++++++-
 tests/system-test/2-query/cols_function.py | 9 ++++++++-
 6 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/source/libs/function/src/builtins.c b/source/libs/function/src/builtins.c
index 6fe01c5fc3..6d4e2c5bdb 100644
--- a/source/libs/function/src/builtins.c
+++ b/source/libs/function/src/builtins.c
@@ -5642,6 +5642,9 @@ const SBuiltinFuncDefinition funcMgtBuiltins[] = {
                    .outputParaInfo = {.validDataType = FUNC_PARAM_SUPPORT_VARCHAR_TYPE}},
     .translateFunc = translateOutVarchar,
   },
+  {
+    .name = "cols",
+  },
 };
 // clang-format on
 
diff --git a/source/libs/function/src/builtinsimpl.c b/source/libs/function/src/builtinsimpl.c
index 096201c3bb..3d1b04f223 100644
--- a/source/libs/function/src/builtinsimpl.c
+++ b/source/libs/function/src/builtinsimpl.c
@@ -2740,7 +2740,7 @@ int32_t lastFunction(SqlFunctionCtx* pCtx) {
 
       if (pResInfo->numOfRes == 0 || pInfo->ts < cts) {
         char*   data = colDataGetData(pInputCol, chosen);
-        int32_t code = doSaveCurrentVal(pCtx, i, cts, NULL, type, data);
+        int32_t code = doSaveCurrentVal(pCtx, chosen, cts, NULL, type, data);
         if (code != TSDB_CODE_SUCCESS) {
           return code;
         }
diff --git a/source/libs/parser/src/parTranslater.c b/source/libs/parser/src/parTranslater.c
index a1c723e3f2..1680808c71 100755
--- a/source/libs/parser/src/parTranslater.c
+++ b/source/libs/parser/src/parTranslater.c
@@ -13726,6 +13726,10 @@ static int32_t extractQueryResultSchema(const SNodeList* pProjections, int32_t*
   int32_t index = 0;
   FOREACH(pNode, pProjections) {
     SExprNode* pExpr = (SExprNode*)pNode;
+    if(pExpr->tupleFuncIdx != 0) {
+      *numOfCols -= 1;
+      continue;
+    }
     if (TSDB_DATA_TYPE_NULL == pExpr->resType.type) {
       (*pSchema)[index].type = TSDB_DATA_TYPE_VARCHAR;
       (*pSchema)[index].bytes = VARSTR_HEADER_SIZE;
diff --git a/source/libs/planner/src/planLogicCreater.c b/source/libs/planner/src/planLogicCreater.c
index 4bb2d7be71..60228725db 100644
--- a/source/libs/planner/src/planLogicCreater.c
+++ b/source/libs/planner/src/planLogicCreater.c
@@ -1600,6 +1600,9 @@ static int32_t createColumnByProjections(SLogicPlanContext* pCxt, const char* pS
   int32_t projIdx = 1;
   FOREACH(pNode, pExprs) {
     SColumnNode* pCol = createColumnByExpr(pStmtName, (SExprNode*)pNode);
+    if (pCol->node.tupleFuncIdx != 0) {
+      continue;
+    }
     if (TSDB_CODE_SUCCESS != (code = nodesListStrictAppend(pList, (SNode*)pCol))) {
       nodesDestroyList(pList);
       return code;
diff --git a/source/libs/planner/src/planOptimizer.c b/source/libs/planner/src/planOptimizer.c
index 11cf926081..63554e3a4e 100644
--- a/source/libs/planner/src/planOptimizer.c
+++ b/source/libs/planner/src/planOptimizer.c
@@ -3471,6 +3471,10 @@ static bool eliminateProjOptCanChildConditionUseChildTargets(SLogicNode* pChild,
     nodesWalkExpr(pJoinLogicNode->pFullOnCond, eliminateProjOptCanUseNewChildTargetsImpl, &cxt);
     if (!cxt.canUse) return false;
   }
+  if (QUERY_NODE_LOGIC_PLAN_AGG == nodeType(pChild) &&
+      ((SAggLogicNode*)pChild)->node.pTargets->length != pNewChildTargets->length) {
+    return false;
+  }
   return true;
 }
 
@@ -3599,7 +3603,8 @@ static int32_t eliminateProjOptimizeImpl(SOptimizeContext* pCxt, SLogicSubplan*
     } else {
       FOREACH(pProjection, pProjectNode->pProjections) {
         FOREACH(pChildTarget, pChild->pTargets) {
-          if (0 == strcmp(((SColumnNode*)pProjection)->colName, ((SColumnNode*)pChildTarget)->colName)) {
+          if (0 == strcmp(((SColumnNode*)pProjection)->colName, ((SColumnNode*)pChildTarget)->colName)
+          && ((SColumnNode*)pProjection)->node.bindTupleFuncIdx == 0) {
             SNode* pNew = NULL;
             code = nodesCloneNode(pChildTarget, &pNew);
             if (TSDB_CODE_SUCCESS == code) {
diff --git a/tests/system-test/2-query/cols_function.py b/tests/system-test/2-query/cols_function.py
index 43244e095f..0c1916b4dd 100644
--- a/tests/system-test/2-query/cols_function.py
+++ b/tests/system-test/2-query/cols_function.py
@@ -86,7 +86,14 @@ class TDTestCase:
         
         tdSql.query(f'select cols(last(c0), ts, c1, c2, c3), cols(first(c0), ts, c1, c2, c3) from db.st')
         tdSql.checkRows(1)
-        tdSql.checkData(0, 1, 'bbbbbbbbb')
+        tdSql.checkData(0, 0, 1734574929003)
+        tdSql.checkData(0, 1, '4.0')
+        tdSql.checkData(0, 2, 'bbbbbbbbb2')
+        tdSql.checkData(0, 3, False)
+        tdSql.checkData(0, 4, 1734574929000)
+        tdSql.checkData(0, 5, '1.0')
+        tdSql.checkData(0, 6, 'a1')
+        tdSql.checkData(0, 7, True)
         
         #tdSql.execute(f'drop table if exists db.st')