From 34c2e6a1808f6d87efd54eec40b19bda59cfec88 Mon Sep 17 00:00:00 2001
From: yihaoDeng <luomoxyz@126.com>
Date: Wed, 19 Jul 2023 02:15:12 +0000
Subject: [PATCH 1/2] forbidden streamsnapshot reader

---
 source/dnode/vnode/src/vnd/vnodeSnapshot.c | 51 +++++++++++-----------
 1 file changed, 26 insertions(+), 25 deletions(-)

diff --git a/source/dnode/vnode/src/vnd/vnodeSnapshot.c b/source/dnode/vnode/src/vnd/vnodeSnapshot.c
index 4a5ccf21ec..70d74268c5 100644
--- a/source/dnode/vnode/src/vnd/vnodeSnapshot.c
+++ b/source/dnode/vnode/src/vnd/vnodeSnapshot.c
@@ -239,30 +239,31 @@ int32_t vnodeSnapRead(SVSnapReader *pReader, uint8_t **ppData, uint32_t *nData)
       }
     }
   }
-  if (!pReader->streamStateDone) {
-    if (pReader->pStreamStateReader == NULL) {
-      code =
-          streamStateSnapReaderOpen(pReader->pVnode->pTq, pReader->sver, pReader->sver, &pReader->pStreamStateReader);
-      if (code) {
-        pReader->streamStateDone = 1;
-        pReader->pStreamStateReader = NULL;
-        goto _err;
-      }
-    }
-    code = streamStateSnapRead(pReader->pStreamStateReader, ppData);
-    if (code) {
-      goto _err;
-    } else {
-      if (*ppData) {
-        goto _exit;
-      } else {
-        pReader->streamStateDone = 1;
-        code = streamStateSnapReaderClose(pReader->pStreamStateReader);
-        if (code) goto _err;
-        pReader->pStreamStateReader = NULL;
-      }
-    }
-  }
+  // if (!pReader->streamStateDone) {
+  //   if (pReader->pStreamStateReader == NULL) {
+  //     code =
+  //         streamStateSnapReaderOpen(pReader->pVnode->pTq, pReader->sver, pReader->sver,
+  //         &pReader->pStreamStateReader);
+  //     if (code) {
+  //       pReader->streamStateDone = 1;
+  //       pReader->pStreamStateReader = NULL;
+  //       goto _err;
+  //     }
+  //   }
+  //   code = streamStateSnapRead(pReader->pStreamStateReader, ppData);
+  //   if (code) {
+  //     goto _err;
+  //   } else {
+  //     if (*ppData) {
+  //       goto _exit;
+  //     } else {
+  //       pReader->streamStateDone = 1;
+  //       code = streamStateSnapReaderClose(pReader->pStreamStateReader);
+  //       if (code) goto _err;
+  //       pReader->pStreamStateReader = NULL;
+  //     }
+  //   }
+  // }
 
   // RSMA ==============
   if (VND_IS_RSMA(pReader->pVnode) && !pReader->rsmaDone) {
@@ -430,7 +431,7 @@ _exit:
 }
 
 static int32_t vnodeSnapWriteInfo(SVSnapWriter *pWriter, uint8_t *pData, uint32_t nData) {
-  int32_t code = 0;
+  int32_t       code = 0;
   SVnode       *pVnode = pWriter->pVnode;
   SSnapDataHdr *pHdr = (SSnapDataHdr *)pData;
 

From 992f1cb328ceef84deb71ce42875ba21237890c9 Mon Sep 17 00:00:00 2001
From: liuyao <54liuyao@163.com>
Date: Mon, 24 Jul 2023 15:00:48 +0800
Subject: [PATCH 2/2] merge code

---
 source/common/src/tglobal.c                   | 1 -
 source/libs/executor/src/timewindowoperator.c | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/source/common/src/tglobal.c b/source/common/src/tglobal.c
index e9abdd5dfa..3ebb4fbf90 100644
--- a/source/common/src/tglobal.c
+++ b/source/common/src/tglobal.c
@@ -539,7 +539,6 @@ static int32_t taosAddServerCfg(SConfig *pCfg) {
 
   if (cfgAddBool(pCfg, "disableStream", tsDisableStream, CFG_SCOPE_SERVER) != 0) return -1;
   if (cfgAddInt64(pCfg, "streamBufferSize", tsStreamBufferSize, 0, INT64_MAX, CFG_SCOPE_SERVER) != 0) return -1;
-  if (cfgAddInt64(pCfg, "checkpointInterval", tsCheckpointInterval, 0, INT64_MAX, CFG_SCOPE_SERVER) != 0) return -1;
 
   if (cfgAddInt32(pCfg, "cacheLazyLoadThreshold", tsCacheLazyLoadThreshold, 0, 100000, CFG_SCOPE_SERVER) != 0) return -1;
 
diff --git a/source/libs/executor/src/timewindowoperator.c b/source/libs/executor/src/timewindowoperator.c
index 06c7a9213f..8951ed59a1 100644
--- a/source/libs/executor/src/timewindowoperator.c
+++ b/source/libs/executor/src/timewindowoperator.c
@@ -3143,7 +3143,6 @@ void destroyStreamSessionAggOperatorInfo(void* param) {
   colDataDestroy(&pInfo->twAggSup.timeWindowData);
   blockDataDestroy(pInfo->pDelRes);
   blockDataDestroy(pInfo->pWinBlock);
-  blockDataDestroy(pInfo->pUpdateRes);
   tSimpleHashCleanup(pInfo->pStUpdated);
   tSimpleHashCleanup(pInfo->pStDeleted);
 
@@ -4883,7 +4882,7 @@ static void compactStateWindow(SOperatorInfo* pOperator, SResultWindowInfo* pCur
 }
 
 void streamStateReloadState(SOperatorInfo* pOperator) {
-  SStreamSessionAggOperatorInfo* pInfo = pOperator->info;
+  SStreamStateAggOperatorInfo*   pInfo = pOperator->info;
   SStreamAggSupporter*           pAggSup = &pInfo->streamAggSup;
   resetWinRange(&pAggSup->winRange);