fix: projection group merge issue

source/libs/planner/src/planLogicCreater.c

@@ -1070,7 +1070,7 @@ static int32_t createProjectLogicNode(SLogicPlanContext* pCxt, SSelectStmt* pSel
 
   TSWAP(pProject->node.pLimit, pSelect->pLimit);
   TSWAP(pProject->node.pSlimit, pSelect->pSlimit);
-  pProject->ignoreGroupId = (pSelect->isSubquery && NULL == pProject->node.pLimit && NULL == pProject->node.pSlimit) ? true : (NULL == pSelect->pPartitionByList);
+  pProject->ignoreGroupId = pSelect->isSubquery ? true : (NULL == pSelect->pPartitionByList);
   pProject->node.groupAction =
       (!pSelect->isSubquery && pCxt->pPlanCxt->streamQuery) ? GROUP_ACTION_KEEP : GROUP_ACTION_CLEAR;
   pProject->node.requireDataOrder = DATA_ORDER_LEVEL_NONE;

source/libs/planner/src/planOptimizer.c

@@ -2351,17 +2351,6 @@ static EDealRes mergeProjectionsExpr(SNode** pNode, void* pContext) {
   return DEAL_RES_CONTINUE;
 }
 
-static int32_t mergeProjectionsLogicNode(SLogicNode* pDstNode, SLogicNode* pSrcNode) {
-  SProjectLogicNode *pDstPro = (SProjectLogicNode*)pDstNode;
-  SProjectLogicNode *pSrcPro = (SProjectLogicNode*)pSrcNode;
-
-  if (!pSrcPro->ignoreGroupId) {
-    pDstPro->ignoreGroupId = pSrcPro->ignoreGroupId;
-  }
-
-  return TSDB_CODE_SUCCESS;
-}
-
 static int32_t mergeProjectsOptimizeImpl(SOptimizeContext* pCxt, SLogicSubplan* pLogicSubplan, SLogicNode* pSelfNode) {
   SLogicNode* pChild = (SLogicNode*)nodesListGetNode(pSelfNode->pChildren, 0);
 
@@ -2371,11 +2360,8 @@ static int32_t mergeProjectsOptimizeImpl(SOptimizeContext* pCxt, SLogicSubplan*
 
   if (TSDB_CODE_SUCCESS == code) {
     if (1 == LIST_LENGTH(pChild->pChildren)) {
-      code = mergeProjectionsLogicNode(pSelfNode, pChild);
-      if (TSDB_CODE_SUCCESS == code) {
-        SLogicNode* pGrandChild = (SLogicNode*)nodesListGetNode(pChild->pChildren, 0);
-        code = replaceLogicNode(pLogicSubplan, pChild, pGrandChild);
-      }
+      SLogicNode* pGrandChild = (SLogicNode*)nodesListGetNode(pChild->pChildren, 0);
+      code = replaceLogicNode(pLogicSubplan, pChild, pGrandChild);
     } else {  // no grand child
       NODES_CLEAR_LIST(pSelfNode->pChildren);
     }

source/libs/planner/src/planSpliter.c

@@ -532,6 +532,24 @@ static int32_t stbSplGetNumOfVgroups(SLogicNode* pNode) {
   return 0;
 }
 
+static int32_t stbSplRewriteFromMergeNode(SMergeLogicNode* pMerge, SLogicNode* pNode) {
+  int32_t code = TSDB_CODE_SUCCESS;
+  
+  switch (nodeType(pNode)) {
+    case QUERY_NODE_LOGIC_PLAN_PROJECT: {
+      SProjectLogicNode *pLogicNode = (SProjectLogicNode*)pNode;
+      if (pMerge->node.pLimit || pMerge->node.pSlimit) {
+        pLogicNode->ignoreGroupId = false;
+      }
+      break;
+    }
+    default:
+      break;
+  }
+
+  return code;
+}
+
 static int32_t stbSplCreateMergeNode(SSplitContext* pCxt, SLogicSubplan* pSubplan, SLogicNode* pSplitNode,
                                      SNodeList* pMergeKeys, SLogicNode* pPartChild, bool groupSort) {
   SMergeLogicNode* pMerge = (SMergeLogicNode*)nodesMakeNode(QUERY_NODE_LOGIC_PLAN_MERGE);
@@ -563,6 +581,9 @@ static int32_t stbSplCreateMergeNode(SSplitContext* pCxt, SLogicSubplan* pSubpla
     ((SLimitNode*)pSplitNode->pLimit)->limit += ((SLimitNode*)pSplitNode->pLimit)->offset;
     ((SLimitNode*)pSplitNode->pLimit)->offset = 0;
   }
+  if (TSDB_CODE_SUCCESS == code) {
+    code = stbSplRewriteFromMergeNode(pMerge, pSplitNode);
+  }
   if (TSDB_CODE_SUCCESS == code) {
     if (NULL == pSubplan) {
       code = nodesListMakeAppend(&pSplitNode->pChildren, (SNode*)pMerge);