From 16ceacac2b3d2fbb6c9b150eb93923617b46e42b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Chappyguoxy=E2=80=9D?= <“happy_guoxy@163.com”>
Date: Fri, 7 Jun 2024 20:12:18 +0800
Subject: [PATCH] fix: no tag value

---
 source/libs/executor/src/groupoperator.c | 26 ++++++++++--------------
 1 file changed, 11 insertions(+), 15 deletions(-)

diff --git a/source/libs/executor/src/groupoperator.c b/source/libs/executor/src/groupoperator.c
index 9473f650ae..63be7eaa67 100644
--- a/source/libs/executor/src/groupoperator.c
+++ b/source/libs/executor/src/groupoperator.c
@@ -570,23 +570,16 @@ SSDataBlock* createBlockDataNotLoaded(const SOperatorInfo* pOperator, SSDataBloc
 
   SSDataBlock* pDstBlock = createDataBlock();
   pDstBlock->info = pDataBlock->info;
-
-  copyPkVal(&pDstBlock->info, &pDataBlock->info);
-  pDstBlock->info.rows = pDataBlock->info.rows;
   pDstBlock->info.capacity = 0;
   pDstBlock->info.rowSize = 0;
-  pDstBlock->info.id = pDataBlock->info.id;
-  pDstBlock->info.blankFill = pDataBlock->info.blankFill;
 
   size_t numOfCols = taosArrayGetSize(pDataBlock->pDataBlock);
   for (int32_t i = 0; i < pOperator->exprSupp.numOfExprs; ++i) {
     SExprInfo*       pExpr = &pOperator->exprSupp.pExprInfo[i];
     int32_t          slotId = pExpr->base.pParam[0].pCol->slotId;
     SColumnInfoData* pSrc = taosArrayGet(pDataBlock->pDataBlock, slotId);
-    if (pSrc) {
-      SColumnInfoData colInfo = {.hasNull = true, .info = pSrc->info};
-      blockDataAppendColInfo(pDstBlock, &colInfo);
-    }
+    SColumnInfoData colInfo = {.hasNull = true, .info = pSrc->info};
+    blockDataAppendColInfo(pDstBlock, &colInfo);
   }
 
   int32_t code = blockDataEnsureCapacity(pDstBlock, pDataBlock->info.rows);
@@ -606,15 +599,18 @@ SSDataBlock* createBlockDataNotLoaded(const SOperatorInfo* pOperator, SSDataBloc
     for (int32_t i = 0; i < pOperator->exprSupp.numOfExprs; ++i) {
       SExprInfo* pExpr = &pOperator->exprSupp.pExprInfo[i];
       int32_t    slotId = pExpr->base.pParam[0].pCol->slotId;
-      if (slotId < numOfCols) {
-        pDstBlock->pBlockAgg[slotId] = pDataBlock->pBlockAgg[i];
-        SColumnInfoData* pSrc = taosArrayGet(pDataBlock->pDataBlock, i);
-        SColumnInfoData* pDst = taosArrayGet(pDstBlock->pDataBlock, slotId);
-        colDataAssign(pDst, pSrc, pDataBlock->info.rows, &pDataBlock->info);
-      }
+      pDstBlock->pBlockAgg[i] = pDataBlock->pBlockAgg[slotId];
     }
   }
 
+  for (int32_t i = 0; i < pOperator->exprSupp.numOfExprs; ++i) {
+    SExprInfo*       pExpr = &pOperator->exprSupp.pExprInfo[i];
+    int32_t          slotId = pExpr->base.pParam[0].pCol->slotId;
+    SColumnInfoData* pSrc = taosArrayGet(pDataBlock->pDataBlock, slotId);
+    SColumnInfoData* pDst = taosArrayGet(pDstBlock->pDataBlock, i);
+    colDataAssign(pDst, pSrc, pDataBlock->info.rows, &pDataBlock->info);
+  }
+
   return pDstBlock;
 }