From 6a71994570ae8d088b95b07bacd549535ee3c6fd Mon Sep 17 00:00:00 2001
From: 54liuyao <54liuyao>
Date: Fri, 19 Jul 2024 14:50:31 +0800
Subject: [PATCH] adj stream op result

---
 .../executor/src/streamcountwindowoperator.c  |  4 ++--
 .../executor/src/streameventwindowoperator.c  |  4 ++--
 source/libs/executor/src/streamfilloperator.c |  4 ++--
 .../executor/src/streamtimewindowoperator.c   | 22 +++++++++----------
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/source/libs/executor/src/streamcountwindowoperator.c b/source/libs/executor/src/streamcountwindowoperator.c
index 68ff0057a5..04310276a9 100644
--- a/source/libs/executor/src/streamcountwindowoperator.c
+++ b/source/libs/executor/src/streamcountwindowoperator.c
@@ -55,13 +55,13 @@ void destroyStreamCountAggOperatorInfo(void* param) {
   pInfo->pUpdated = NULL;
 
   colDataDestroy(&pInfo->twAggSup.timeWindowData);
-  pInfo->pDelRes = blockDataDestroy(pInfo->pDelRes);
+  blockDataDestroy(pInfo->pDelRes);
   tSimpleHashCleanup(pInfo->pStUpdated);
   tSimpleHashCleanup(pInfo->pStDeleted);
   cleanupGroupResInfo(&pInfo->groupResInfo);
 
   taosArrayDestroy(pInfo->historyWins);
-  pInfo->pCheckpointRes = blockDataDestroy(pInfo->pCheckpointRes);
+  blockDataDestroy(pInfo->pCheckpointRes);
 
   tSimpleHashCleanup(pInfo->pPkDeleted);
 
diff --git a/source/libs/executor/src/streameventwindowoperator.c b/source/libs/executor/src/streameventwindowoperator.c
index 2e4ea29437..2d6f9b1fc5 100644
--- a/source/libs/executor/src/streameventwindowoperator.c
+++ b/source/libs/executor/src/streameventwindowoperator.c
@@ -60,14 +60,14 @@ void destroyStreamEventOperatorInfo(void* param) {
     taosArrayDestroy(pInfo->pChildren);
   }
   colDataDestroy(&pInfo->twAggSup.timeWindowData);
-  pInfo->pDelRes = blockDataDestroy(pInfo->pDelRes);
+  blockDataDestroy(pInfo->pDelRes);
   tSimpleHashCleanup(pInfo->pSeUpdated);
   tSimpleHashCleanup(pInfo->pAllUpdated);
   tSimpleHashCleanup(pInfo->pSeDeleted);
   cleanupGroupResInfo(&pInfo->groupResInfo);
 
   taosArrayDestroy(pInfo->historyWins);
-  pInfo->pDelRes = blockDataDestroy(pInfo->pCheckpointRes);
+  blockDataDestroy(pInfo->pCheckpointRes);
 
   tSimpleHashCleanup(pInfo->pPkDeleted);
 
diff --git a/source/libs/executor/src/streamfilloperator.c b/source/libs/executor/src/streamfilloperator.c
index 9468738d43..314a226b5d 100644
--- a/source/libs/executor/src/streamfilloperator.c
+++ b/source/libs/executor/src/streamfilloperator.c
@@ -123,8 +123,8 @@ void destroyStreamFillInfo(SStreamFillInfo* pFillInfo) {
 
 static void destroyStreamFillOperatorInfo(void* param) {
   SStreamFillOperatorInfo* pInfo = (SStreamFillOperatorInfo*)param;
-  pInfo->pFillInfo = destroyStreamFillInfo(pInfo->pFillInfo);
-  pInfo->pFillSup = destroyStreamFillSupporter(pInfo->pFillSup);
+  destroyStreamFillInfo(pInfo->pFillInfo);
+  destroyStreamFillSupporter(pInfo->pFillSup);
   blockDataDestroy(pInfo->pRes);
   pInfo->pRes = NULL;
   blockDataDestroy(pInfo->pSrcBlock);
diff --git a/source/libs/executor/src/streamtimewindowoperator.c b/source/libs/executor/src/streamtimewindowoperator.c
index da68c0e2b5..50b20344d6 100644
--- a/source/libs/executor/src/streamtimewindowoperator.c
+++ b/source/libs/executor/src/streamtimewindowoperator.c
@@ -465,11 +465,11 @@ void destroyStreamFinalIntervalOperatorInfo(void* param) {
   taosHashCleanup(pInfo->pPullDataMap);
   taosHashCleanup(pInfo->pFinalPullDataMap);
   taosArrayDestroy(pInfo->pPullWins);
-  pInfo->pPullDataRes = blockDataDestroy(pInfo->pPullDataRes);
+  blockDataDestroy(pInfo->pPullDataRes);
   taosArrayDestroy(pInfo->pDelWins);
-  pInfo->pDelRes = blockDataDestroy(pInfo->pDelRes);
-  pInfo->pMidRetriveRes = blockDataDestroy(pInfo->pMidRetriveRes);
-  pInfo->pMidPulloverRes = blockDataDestroy(pInfo->pMidPulloverRes);
+  blockDataDestroy(pInfo->pDelRes);
+  blockDataDestroy(pInfo->pMidRetriveRes);
+  blockDataDestroy(pInfo->pMidPulloverRes);
   pInfo->stateStore.streamFileStateDestroy(pInfo->pState->pFileState);
   taosArrayDestroy(pInfo->pMidPullDatas);
 
@@ -486,7 +486,7 @@ void destroyStreamFinalIntervalOperatorInfo(void* param) {
   pInfo->pUpdatedMap = NULL;
   tSimpleHashCleanup(pInfo->pDeletedMap);
 
-  pInfo->pCheckpointRes = blockDataDestroy(pInfo->pCheckpointRes);
+  blockDataDestroy(pInfo->pCheckpointRes);
 
   taosMemoryFreeClear(param);
 }
@@ -1943,7 +1943,7 @@ _error:
 void destroyStreamAggSupporter(SStreamAggSupporter* pSup) {
   tSimpleHashCleanup(pSup->pResultRows);
   destroyDiskbasedBuf(pSup->pResultBuf);
-  pSup->pScanBlock = blockDataDestroy(pSup->pScanBlock);
+  blockDataDestroy(pSup->pScanBlock);
   pSup->stateStore.streamFileStateDestroy(pSup->pState->pFileState);
   taosMemoryFreeClear(pSup->pState);
   taosMemoryFreeClear(pSup->pDummyCtx);
@@ -1968,14 +1968,14 @@ void destroyStreamSessionAggOperatorInfo(void* param) {
   }
 
   colDataDestroy(&pInfo->twAggSup.timeWindowData);
-  pInfo->pDelRes = blockDataDestroy(pInfo->pDelRes);
-  pInfo->pWinBlock = blockDataDestroy(pInfo->pWinBlock);
+  blockDataDestroy(pInfo->pDelRes);
+  blockDataDestroy(pInfo->pWinBlock);
   tSimpleHashCleanup(pInfo->pStUpdated);
   tSimpleHashCleanup(pInfo->pStDeleted);
   cleanupGroupResInfo(&pInfo->groupResInfo);
 
   taosArrayDestroy(pInfo->historyWins);
-  pInfo->pCheckpointRes = blockDataDestroy(pInfo->pCheckpointRes);
+  blockDataDestroy(pInfo->pCheckpointRes);
   tSimpleHashCleanup(pInfo->pPkDeleted);
 
   taosMemoryFreeClear(param);
@@ -3946,13 +3946,13 @@ void destroyStreamStateOperatorInfo(void* param) {
     taosArrayDestroy(pInfo->pChildren);
   }
   colDataDestroy(&pInfo->twAggSup.timeWindowData);
-  pInfo->pDelRes = blockDataDestroy(pInfo->pDelRes);
+  blockDataDestroy(pInfo->pDelRes);
   tSimpleHashCleanup(pInfo->pSeUpdated);
   tSimpleHashCleanup(pInfo->pSeDeleted);
   cleanupGroupResInfo(&pInfo->groupResInfo);
 
   taosArrayDestroy(pInfo->historyWins);
-  pInfo->pCheckpointRes = blockDataDestroy(pInfo->pCheckpointRes);
+  blockDataDestroy(pInfo->pCheckpointRes);
   tSimpleHashCleanup(pInfo->pPkDeleted);
 
   taosMemoryFreeClear(param);