From c1f935bd124956fd83cf6e5e1772c367330296bf Mon Sep 17 00:00:00 2001
From: dapan1121 <wpan@taosdata.com>
Date: Thu, 9 Nov 2023 14:49:04 +0800
Subject: [PATCH] fix: const value replace issue

---
 source/libs/parser/src/parCalcConst.c | 11 +++++++++--
 tests/parallel_test/cases.task        |  1 +
 tests/script/tsim/query/const.sim     | 11 +++++++++++
 3 files changed, 21 insertions(+), 2 deletions(-)
 create mode 100644 tests/script/tsim/query/const.sim

diff --git a/source/libs/parser/src/parCalcConst.c b/source/libs/parser/src/parCalcConst.c
index 0657f1a43d..441f4da3b1 100644
--- a/source/libs/parser/src/parCalcConst.c
+++ b/source/libs/parser/src/parCalcConst.c
@@ -176,12 +176,15 @@ static int32_t calcConstStmtCondition(SCalcConstContext* pCxt, SNode** pCond, bo
 static EDealRes doFindAndReplaceNode(SNode** pNode, void* pContext) {
   SCalcConstContext* pCxt = pContext;
   if (pCxt->replaceCxt.pTarget == *pNode) {
+    char aliasName[TSDB_COL_NAME_LEN] = {0};
+    strcpy(aliasName, ((SExprNode*)*pNode)->aliasName);
     nodesDestroyNode(*pNode);
     *pNode = nodesCloneNode(pCxt->replaceCxt.pNew);
     if (NULL == *pNode) {
       pCxt->code = TSDB_CODE_OUT_OF_MEMORY;
       return DEAL_RES_ERROR;
     }
+    strcpy(((SExprNode*)*pNode)->aliasName, aliasName);
 
     pCxt->replaceCxt.replaced = true;
     return DEAL_RES_END;
@@ -211,7 +214,6 @@ static int32_t calcConstProject(SCalcConstContext* pCxt, SNode* pProject, bool d
   }
 
   char aliasName[TSDB_COL_NAME_LEN] = {0};
-  strcpy(aliasName, ((SExprNode*)pProject)->aliasName);
   int32_t code = TSDB_CODE_SUCCESS;
   if (dual) {
     code = scalarCalculateConstantsFromDual(pProject, pNew);
@@ -219,15 +221,20 @@ static int32_t calcConstProject(SCalcConstContext* pCxt, SNode* pProject, bool d
     code = scalarCalculateConstants(pProject, pNew);
   }
   if (TSDB_CODE_SUCCESS == code) {
-    strcpy(((SExprNode*)*pNew)->aliasName, aliasName);
     if (QUERY_NODE_VALUE == nodeType(*pNew) && NULL != pAssociation) {
       int32_t size = taosArrayGetSize(pAssociation);
       for (int32_t i = 0; i < size; ++i) {
         SAssociationNode* pAssNode = taosArrayGet(pAssociation, i);
         SNode** pCol = pAssNode->pPlace;
         if (*pCol == pAssNode->pAssociationNode) {
+          strcpy(aliasName, ((SExprNode*)*pCol)->aliasName);
+          SArray* pOrigAss = NULL;
+          TSWAP(((SExprNode*)*pCol)->pAssociation, pOrigAss);
           nodesDestroyNode(*pCol);
           *pCol = nodesCloneNode(*pNew);
+          TSWAP(pOrigAss, ((SExprNode*)*pCol)->pAssociation);
+          taosArrayDestroy(pOrigAss);
+          strcpy(((SExprNode*)*pCol)->aliasName, aliasName);
           if (NULL == *pCol) {
             code = TSDB_CODE_OUT_OF_MEMORY;
             break;
diff --git a/tests/parallel_test/cases.task b/tests/parallel_test/cases.task
index 28aa8744fd..9fd3625b4c 100644
--- a/tests/parallel_test/cases.task
+++ b/tests/parallel_test/cases.task
@@ -1294,6 +1294,7 @@ e
 ,,y,script,./test.sh -f tsim/tagindex/add_index.sim
 ,,n,script,./test.sh -f tsim/tagindex/sma_and_tag_index.sim
 ,,y,script,./test.sh -f tsim/view/view.sim
+,,y,script,./test.sh -f tsim/query/const.sim 
 
 
 #develop test
diff --git a/tests/script/tsim/query/const.sim b/tests/script/tsim/query/const.sim
new file mode 100644
index 0000000000..08f2b909c1
--- /dev/null
+++ b/tests/script/tsim/query/const.sim
@@ -0,0 +1,11 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/exec.sh -n dnode1 -s start
+sql connect
+
+sql select b.z from (select c.a as z from (select 'a' as a) c) b;
+if $rows != 1 then
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT