From 9dd060b43907fd494c91c7ed1752735dc3b7bf71 Mon Sep 17 00:00:00 2001
From: Minglei Jin <mljin@taosdata.com>
Date: Sat, 25 Jun 2022 20:46:16 +0800
Subject: [PATCH] use new tsdbReadBlockData interface

---
 source/dnode/vnode/src/tsdb/tsdbCache.c  | 9 +++++----
 source/dnode/vnode/src/tsdb/tsdbCommit.c | 2 ++
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/source/dnode/vnode/src/tsdb/tsdbCache.c b/source/dnode/vnode/src/tsdb/tsdbCache.c
index d09926660a..72b94d3f6f 100644
--- a/source/dnode/vnode/src/tsdb/tsdbCache.c
+++ b/source/dnode/vnode/src/tsdb/tsdbCache.c
@@ -271,7 +271,7 @@ static int32_t mergeLastRowFileSet(STbDataIter *iter, STbDataIter *iiter, SDFile
 
     tMapDataGetItemByIdx(&blockMap, iBlock, &block, tGetBlock);
 
-    code = tsdbReadBlockData(pDataFReader, &blockIdx, &block, &blockData, NULL, 0, NULL, NULL);
+    code = tsdbReadBlockData(pDataFReader, &blockIdx, &block, &blockData, NULL, NULL);
     if (code) goto _err;
 
     int32_t nRow = blockData.nRow;
@@ -311,6 +311,7 @@ _err:
   return code;
 }
 #endif
+
 typedef enum SFSNEXTROWSTATES {
   SFSNEXTROW_FS,
   SFSNEXTROW_FILESET,
@@ -383,7 +384,7 @@ static int32_t getNextRowFromFS(void *iter, TSDBROW **ppRow) {
         tBlockDataReset(&state->blockData);
 
         tMapDataGetItemByIdx(&state->blockMap, state->iBlock, &block, tGetBlock);
-        code = tsdbReadBlockData(state->pDataFReader, &state->blockIdx, &block, &state->blockData, NULL, 0, NULL, NULL);
+        code = tsdbReadBlockData(state->pDataFReader, &state->blockIdx, &block, &state->blockData, NULL, NULL);
         if (code) goto _err;
 
         state->nRow = state->blockData.nRow;
@@ -601,9 +602,9 @@ static int32_t mergeLastRow(tb_uid_t uid, STsdb *pTsdb, STSRow **ppRow) {
       // bool deleted = tsdbKeyDeleted(maxKey, pSkyline, &iSkyline);
       if (!deleted) {
         merge[nMerge++] = max[i];
-      } else {
-        input[iMax[i]].next = true;
       }
+
+      input[iMax[i]].next = deleted;
     }
 
     // merge if nMerge > 1
diff --git a/source/dnode/vnode/src/tsdb/tsdbCommit.c b/source/dnode/vnode/src/tsdb/tsdbCommit.c
index 43e486cbdf..4371cded64 100644
--- a/source/dnode/vnode/src/tsdb/tsdbCommit.c
+++ b/source/dnode/vnode/src/tsdb/tsdbCommit.c
@@ -61,6 +61,8 @@ static int32_t tsdbEndCommit(SCommitter *pCommitter, int32_t eno);
 int32_t tsdbBegin(STsdb *pTsdb) {
   int32_t code = 0;
 
+  if (!pTsdb) return code;
+
   code = tsdbMemTableCreate(pTsdb, &pTsdb->mem);
   if (code) goto _err;