From 8d6f129154fb2fc44ca59261ac52eabe8dd3ccf7 Mon Sep 17 00:00:00 2001
From: stephenkgu <stephenk@gmx.us>
Date: Thu, 10 Nov 2022 08:14:21 +0800
Subject: [PATCH] fix: skip empty data in delete file

---
 source/dnode/vnode/src/tsdb/tsdbCache.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/source/dnode/vnode/src/tsdb/tsdbCache.c b/source/dnode/vnode/src/tsdb/tsdbCache.c
index 76236e5078..291a5ab1eb 100644
--- a/source/dnode/vnode/src/tsdb/tsdbCache.c
+++ b/source/dnode/vnode/src/tsdb/tsdbCache.c
@@ -475,7 +475,7 @@ _err:
   }
   return code;
 }
-
+/*
 static int32_t getTableDelIdx(SDelFReader *pDelFReader, tb_uid_t suid, tb_uid_t uid, SDelIdx *pDelIdx) {
   int32_t code = 0;
   SArray *pDelIdxArray = NULL;
@@ -499,7 +499,7 @@ _err:
   }
   return code;
 }
-
+*/
 typedef enum {
   SFSLASTNEXTROW_FS,
   SFSLASTNEXTROW_FILESET,
@@ -997,8 +997,6 @@ static int32_t nextRowIterOpen(CacheNextRowIter *pIter, tb_uid_t uid, STsdb *pTs
 
   pIter->pSkyline = taosArrayInit(32, sizeof(TSDBKEY));
 
-  SDelIdx delIdx;
-
   SDelFile *pDelFile = pReadSnap->fs.pDelFile;
   if (pDelFile) {
     SDelFReader *pDelFReader;
@@ -1006,18 +1004,20 @@ static int32_t nextRowIterOpen(CacheNextRowIter *pIter, tb_uid_t uid, STsdb *pTs
     code = tsdbDelFReaderOpen(&pDelFReader, pDelFile, pTsdb);
     if (code) goto _err;
 
-    code = getTableDelIdx(pDelFReader, suid, uid, &delIdx);
-    if (code) {
-      tsdbDelFReaderClose(&pDelFReader);
-      goto _err;
-    }
+    SArray *pDelIdxArray = taosArrayInit(32, sizeof(SDelIdx));
+
+    code = tsdbReadDelIdx(pDelFReader, pDelIdxArray);
+    if (code) goto _err;
+
+    SDelIdx *delIdx = taosArraySearch(pDelIdxArray, &(SDelIdx){.suid = suid, .uid = uid}, tCmprDelIdx, TD_EQ);
 
-    code = getTableDelSkyline(pMem, pIMem, pDelFReader, &delIdx, pIter->pSkyline);
+    code = getTableDelSkyline(pMem, pIMem, pDelFReader, delIdx, pIter->pSkyline);
     if (code) {
       tsdbDelFReaderClose(&pDelFReader);
       goto _err;
     }
 
+    taosArrayDestroy(pDelIdxArray);
     tsdbDelFReaderClose(&pDelFReader);
   } else {
     code = getTableDelSkyline(pMem, pIMem, NULL, NULL, pIter->pSkyline);
-- 
GitLab