From fe495f701342f64a277595f46acfbe663f1d1a87 Mon Sep 17 00:00:00 2001
From: Minglei Jin <mljin@taosdata.com>
Date: Thu, 27 Jul 2023 12:44:36 +0800
Subject: [PATCH] tsdb/commit2: fix commit minKey for del

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

diff --git a/source/dnode/vnode/src/tsdb/tsdbCommit2.c b/source/dnode/vnode/src/tsdb/tsdbCommit2.c
index 6b0ee92252..0639cd91a5 100644
--- a/source/dnode/vnode/src/tsdb/tsdbCommit2.c
+++ b/source/dnode/vnode/src/tsdb/tsdbCommit2.c
@@ -198,9 +198,6 @@ static int32_t tsdbCommitTombData(SCommitter2 *committer) {
 
     if (record->ekey > committer->ctx->maxKey && committer->ctx->nextKey > maxKey) {
       committer->ctx->nextKey = maxKey;
-      if (record->ekey < TSKEY_MAX) {
-        committer->ctx->maxDelKey = record->ekey;
-      }
     }
 
     record->skey = TMAX(record->skey, committer->ctx->minKey);
@@ -472,13 +469,6 @@ static int32_t tsdbOpenCommitter(STsdb *tsdb, SCommitInfo *info, SCommitter2 *co
   committer->ctx->cid = tsdbFSAllocEid(tsdb->pFS);
   committer->ctx->now = taosGetTimestampSec();
 
-  committer->ctx->maxDelKey = TSKEY_MIN;
-  if (TARRAY2_SIZE(committer->fsetArr) > 0) {
-    STFileSet *fset = TARRAY2_LAST(committer->fsetArr);
-    TSKEY      minKey;
-    tsdbFidKeyRange(fset->fid, committer->minutes, committer->precision, &minKey, &committer->ctx->maxDelKey);
-  }
-
   committer->ctx->nextKey = tsdb->imem->minKey;
   if (tsdb->imem->nDel > 0) {
     SRBTreeIter iter[1] = {tRBTreeIterCreate(tsdb->imem->tbDataTree, 1)};
@@ -494,6 +484,21 @@ static int32_t tsdbOpenCommitter(STsdb *tsdb, SCommitInfo *info, SCommitter2 *co
     }
   }
 
+  committer->ctx->maxDelKey = TSKEY_MIN;
+  TSKEY minKey = TSKEY_MAX;
+  TSKEY maxKey = TSKEY_MIN;
+  if (TARRAY2_SIZE(committer->fsetArr) > 0) {
+    STFileSet *fset = TARRAY2_LAST(committer->fsetArr);
+    tsdbFidKeyRange(fset->fid, committer->minutes, committer->precision, &minKey, &committer->ctx->maxDelKey);
+
+    fset = TARRAY2_FIRST(committer->fsetArr);
+    tsdbFidKeyRange(fset->fid, committer->minutes, committer->precision, &minKey, &maxKey);
+  }
+
+  if (committer->ctx->nextKey < TMIN(tsdb->imem->minKey, minKey)) {
+    committer->ctx->nextKey = TMIN(tsdb->imem->minKey, minKey);
+  }
+
 _exit:
   if (code) {
     TSDB_ERROR_LOG(TD_VID(tsdb->pVnode), lino, code);