From 1a950afdb85197dd23426ebb2b79462e8fefacff Mon Sep 17 00:00:00 2001
From: kailixu <klxu@taosdata.com>
Date: Thu, 9 Nov 2023 12:09:27 +0800
Subject: [PATCH] enh: test case for rsma snapshot

---
 source/dnode/vnode/src/sma/smaRollup.c           | 10 +++++-----
 source/libs/stream/src/streamTask.c              |  1 -
 .../script/tsim/sync/vnodesnapshot-rsma-test.sim | 16 +++++++++++-----
 3 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/source/dnode/vnode/src/sma/smaRollup.c b/source/dnode/vnode/src/sma/smaRollup.c
index 73a0849ab2..252a3ade36 100644
--- a/source/dnode/vnode/src/sma/smaRollup.c
+++ b/source/dnode/vnode/src/sma/smaRollup.c
@@ -944,7 +944,7 @@ int32_t tdProcessRSmaSubmit(SSma *pSma, int64_t version, void *pReq, void *pMsg,
     return TDB_CODE_SUCCESS;
   }
 
-  if (0 != (terrno = atomic_load_32(&SMA_RSMA_STAT(pSma)->execStat))) {
+  if ((terrno = atomic_load_32(&SMA_RSMA_STAT(pSma)->execStat))) {
     smaError("vgId:%d, failed to process rsma submit since invalid exec code: %s", SMA_VID(pSma), terrstr());
     goto _err;
   }
@@ -1224,9 +1224,9 @@ _checkpoint:
           }
 
           taosWLockLatch(&pMeta->lock);
-          if (0 != streamMetaSaveTask(pMeta, pTask)) {
+          if (streamMetaSaveTask(pMeta, pTask)) {
             taosWUnLockLatch(&pMeta->lock);
-            code = terrno != 0 ? terrno : TSDB_CODE_OUT_OF_MEMORY;
+            code = terrno ? terrno : TSDB_CODE_OUT_OF_MEMORY;
             taosHashCancelIterate(pInfoHash, infoHash);
             TSDB_CHECK_CODE(code, lino, _exit);
           }
@@ -1239,9 +1239,9 @@ _checkpoint:
     }
     if (pMeta) {
       taosWLockLatch(&pMeta->lock);
-      if (0 != streamMetaCommit(pMeta)) {
+      if (streamMetaCommit(pMeta)) {
         taosWUnLockLatch(&pMeta->lock);
-        code = terrno != 0 ? terrno : TSDB_CODE_OUT_OF_MEMORY;
+        code = terrno ? terrno : TSDB_CODE_OUT_OF_MEMORY;
         TSDB_CHECK_CODE(code, lino, _exit);
       }
       taosWUnLockLatch(&pMeta->lock);
diff --git a/source/libs/stream/src/streamTask.c b/source/libs/stream/src/streamTask.c
index 59002e456a..a7fb590d1b 100644
--- a/source/libs/stream/src/streamTask.c
+++ b/source/libs/stream/src/streamTask.c
@@ -195,7 +195,6 @@ int32_t tDecodeStreamTask(SDecoder* pDecoder, SStreamTask* pTask) {
 
   if (tDecodeU64(pDecoder, &pTask->dataRange.range.minVer)) return -1;
   if (tDecodeU64(pDecoder, &pTask->dataRange.range.maxVer)) return -1;
-
   if (tDecodeI64(pDecoder, &pTask->dataRange.window.skey)) return -1;
   if (tDecodeI64(pDecoder, &pTask->dataRange.window.ekey)) return -1;
 
diff --git a/tests/script/tsim/sync/vnodesnapshot-rsma-test.sim b/tests/script/tsim/sync/vnodesnapshot-rsma-test.sim
index b1e5ed200f..8b1720d213 100644
--- a/tests/script/tsim/sync/vnodesnapshot-rsma-test.sim
+++ b/tests/script/tsim/sync/vnodesnapshot-rsma-test.sim
@@ -167,9 +167,6 @@ system sh/exec.sh -n dnode4 -s start
 
 sleep 3000
 
-
-
-
 print =============== query data of level 1
 sql connect
 sql use db
@@ -181,12 +178,21 @@ if $rows != 100 then
   return -1
 endi
 
+print =============== sleep 5s to wait the result
+sleep 5000
+
 print =============== query data of level 2
 sql select * from ct1 where ts > now - 10d
-print rows of level 2: $rows
 print $data00 $data01 $data02
+print $data10 $data11 $data12
+if $rows != 100 then
+  print rows of level 2: $rows
+endi
 
 print =============== query data of level 3
 sql select * from ct1
-print rows of level 3: $rows
 print $data00 $data01 $data02
+print $data10 $data11 $data12
+if $rows != 100 then
+  print rows of level 3: $rows
+endi
\ No newline at end of file