From 77d2737f91f18f1d9063957dc815c4e4b4e2f1ee Mon Sep 17 00:00:00 2001
From: Ganlin Zhao <ganlinzhao@hotmail.com>
Date: Sun, 25 Jun 2023 17:51:51 +0800
Subject: [PATCH] fix: fix userAlias issue when keepColumnName is set to true

---
 include/libs/nodes/querynodes.h            |  1 +
 source/libs/nodes/src/nodesTraverseFuncs.c | 19 +++++++++++++++++--
 source/libs/parser/src/parTranslater.c     |  2 +-
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/include/libs/nodes/querynodes.h b/include/libs/nodes/querynodes.h
index 678c694d9b..dc312a762e 100644
--- a/include/libs/nodes/querynodes.h
+++ b/include/libs/nodes/querynodes.h
@@ -52,6 +52,7 @@ typedef struct SExprNode {
   SArray*   pAssociation;
   bool      orderAlias;
   bool      asAlias;
+  bool      asParam;
 } SExprNode;
 
 typedef enum EColumnType {
diff --git a/source/libs/nodes/src/nodesTraverseFuncs.c b/source/libs/nodes/src/nodesTraverseFuncs.c
index ce575ede8a..b3623a4b0a 100644
--- a/source/libs/nodes/src/nodesTraverseFuncs.c
+++ b/source/libs/nodes/src/nodesTraverseFuncs.c
@@ -214,6 +214,18 @@ void nodesWalkExprsPostOrder(SNodeList* pList, FNodeWalker walker, void* pContex
   (void)walkExprs(pList, TRAVERSAL_POSTORDER, walker, pContext);
 }
 
+static void checkParamIsFunc(SFunctionNode *pFunc) {
+  int32_t numOfParams = LIST_LENGTH(pFunc->pParameterList);
+  if (numOfParams > 1) {
+    for (int32_t i = 0; i < numOfParams; ++i) {
+      SNode* pPara = nodesListGetNode(pFunc->pParameterList, i);
+      if (nodeType(pPara) == QUERY_NODE_FUNCTION) {
+        ((SFunctionNode *)pPara)->node.asParam = true;
+      }
+    }
+  }
+}
+
 static EDealRes rewriteExprs(SNodeList* pNodeList, ETraversalOrder order, FNodeRewriter rewriter, void* pContext);
 
 static EDealRes rewriteExpr(SNode** pRawNode, ETraversalOrder order, FNodeRewriter rewriter, void* pContext) {
@@ -248,9 +260,12 @@ static EDealRes rewriteExpr(SNode** pRawNode, ETraversalOrder order, FNodeRewrit
     case QUERY_NODE_LOGIC_CONDITION:
       res = rewriteExprs(((SLogicConditionNode*)pNode)->pParameterList, order, rewriter, pContext);
       break;
-    case QUERY_NODE_FUNCTION:
-      res = rewriteExprs(((SFunctionNode*)pNode)->pParameterList, order, rewriter, pContext);
+    case QUERY_NODE_FUNCTION: {
+      SFunctionNode* pFunc = (SFunctionNode*)pNode;
+      checkParamIsFunc(pFunc);
+      res = rewriteExprs(pFunc->pParameterList, order, rewriter, pContext);
       break;
+    }
     case QUERY_NODE_REAL_TABLE:
     case QUERY_NODE_TEMP_TABLE:
       break;  // todo
diff --git a/source/libs/parser/src/parTranslater.c b/source/libs/parser/src/parTranslater.c
index b3a043fe12..90fe4f3e4c 100644
--- a/source/libs/parser/src/parTranslater.c
+++ b/source/libs/parser/src/parTranslater.c
@@ -1760,7 +1760,7 @@ static int32_t translateMultiResFunc(STranslateContext* pCxt, SFunctionNode* pFu
                                      "%s(*) is only supported in SELECTed list", pFunc->functionName);
     }
   }
-  if (tsKeepColumnName && 1 == LIST_LENGTH(pFunc->pParameterList) && !pFunc->node.asAlias) {
+  if (tsKeepColumnName && 1 == LIST_LENGTH(pFunc->pParameterList) && !pFunc->node.asAlias && !pFunc->node.asParam) {
     strcpy(pFunc->node.userAlias, ((SExprNode*)nodesListGetNode(pFunc->pParameterList, 0))->userAlias);
     strcpy(pFunc->node.aliasName, pFunc->node.userAlias);
   }
-- 
GitLab