From 1446b4473328934d2f5967a03328c6c4fa573a0e Mon Sep 17 00:00:00 2001
From: Benguang Zhao <bgzhao@taosdata.com>
Date: Thu, 31 Aug 2023 10:25:53 +0800
Subject: [PATCH] fixup: remove minVer and maxVer in FSetWriterConfig

---
 source/dnode/vnode/src/inc/vnodeInt.h     | 6 ------
 source/dnode/vnode/src/tsdb/tsdbCommit2.c | 6 ------
 source/dnode/vnode/src/tsdb/tsdbFSetRW.c  | 8 ++++----
 source/dnode/vnode/src/tsdb/tsdbFSetRW.h  | 2 --
 source/dnode/vnode/src/vnd/vnodeCommit.c  | 2 --
 5 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/source/dnode/vnode/src/inc/vnodeInt.h b/source/dnode/vnode/src/inc/vnodeInt.h
index 7a242b55cf..cc355c5f32 100644
--- a/source/dnode/vnode/src/inc/vnodeInt.h
+++ b/source/dnode/vnode/src/inc/vnodeInt.h
@@ -527,16 +527,10 @@ struct SSnapDataHdr {
   uint8_t data[];
 };
 
-typedef struct SRange {
-  int64_t start;
-  int64_t end;
-} SRange;
-
 struct SCommitInfo {
   SVnodeInfo info;
   SVnode*    pVnode;
   TXN*       txn;
-  SRange     vers;
 };
 
 struct SCompactInfo {
diff --git a/source/dnode/vnode/src/tsdb/tsdbCommit2.c b/source/dnode/vnode/src/tsdb/tsdbCommit2.c
index 4e096a7f17..302991fb0f 100644
--- a/source/dnode/vnode/src/tsdb/tsdbCommit2.c
+++ b/source/dnode/vnode/src/tsdb/tsdbCommit2.c
@@ -76,8 +76,6 @@ static int32_t tsdbCommitOpenWriter(SCommitter2 *committer) {
       .szPage = committer->szPage,
       .cmprAlg = committer->cmprAlg,
       .fid = committer->ctx->fid,
-      .minVer = committer->ctx->minVer,
-      .maxVer = committer->ctx->maxVer,
       .cid = committer->ctx->cid,
       .did = committer->ctx->did,
       .level = 0,
@@ -91,8 +89,6 @@ static int32_t tsdbCommitOpenWriter(SCommitter2 *committer) {
         if (committer->ctx->fset->farr[ftype] != NULL) {
           config.files[ftype].exist = true;
           config.files[ftype].file = committer->ctx->fset->farr[ftype]->f[0];
-          config.files[ftype].file.minVer = TMIN(config.files[ftype].file.minVer, config.minVer);
-          config.files[ftype].file.maxVer = TMAX(config.files[ftype].file.maxVer, config.maxVer);
         }
       }
     }
@@ -469,8 +465,6 @@ static int32_t tsdbOpenCommitter(STsdb *tsdb, SCommitInfo *info, SCommitter2 *co
   committer->compactVersion = INT64_MAX;
   committer->ctx->cid = tsdbFSAllocEid(tsdb->pFS);
   committer->ctx->now = taosGetTimestampSec();
-  committer->ctx->minVer = info->vers.start;
-  committer->ctx->maxVer = info->vers.end;
 
   committer->ctx->nextKey = tsdb->imem->minKey;
   if (tsdb->imem->nDel > 0) {
diff --git a/source/dnode/vnode/src/tsdb/tsdbFSetRW.c b/source/dnode/vnode/src/tsdb/tsdbFSetRW.c
index 801ae59838..4397d1cb5c 100644
--- a/source/dnode/vnode/src/tsdb/tsdbFSetRW.c
+++ b/source/dnode/vnode/src/tsdb/tsdbFSetRW.c
@@ -143,8 +143,8 @@ int32_t tsdbFSetWriterOpen(SFSetWriterConfig *config, SFSetWriter **writer) {
         .maxRow = config->maxRow,
         .szPage = config->szPage,
         .fid = config->fid,
-        .minVer = config->minVer,
-        .maxVer = config->maxVer,
+        .minVer = VERSION_MAX,
+        .maxVer = VERSION_MIN,
         .cid = config->cid,
         .did = config->did,
         .compactVersion = config->compactVersion,
@@ -170,8 +170,8 @@ int32_t tsdbFSetWriterOpen(SFSetWriterConfig *config, SFSetWriter **writer) {
       .compactVersion = config->compactVersion,
       .did = config->did,
       .fid = config->fid,
-      .minVer = config->minVer,
-      .maxVer = config->maxVer,
+      .minVer = VERSION_MAX,
+      .maxVer = VERSION_MIN,
       .cid = config->cid,
       .level = config->level,
       .skmTb = writer[0]->skmTb,
diff --git a/source/dnode/vnode/src/tsdb/tsdbFSetRW.h b/source/dnode/vnode/src/tsdb/tsdbFSetRW.h
index a733bb3c44..0a8049cded 100644
--- a/source/dnode/vnode/src/tsdb/tsdbFSetRW.h
+++ b/source/dnode/vnode/src/tsdb/tsdbFSetRW.h
@@ -34,8 +34,6 @@ typedef struct {
   int32_t szPage;
   int8_t  cmprAlg;
   int32_t fid;
-  int64_t minVer;
-  int64_t maxVer;
   int64_t cid;
   SDiskID did;
   int32_t level;
diff --git a/source/dnode/vnode/src/vnd/vnodeCommit.c b/source/dnode/vnode/src/vnd/vnodeCommit.c
index 775b298268..50ca2f5d03 100644
--- a/source/dnode/vnode/src/vnd/vnodeCommit.c
+++ b/source/dnode/vnode/src/vnd/vnodeCommit.c
@@ -297,8 +297,6 @@ static int32_t vnodePrepareCommit(SVnode *pVnode, SCommitInfo *pInfo) {
   pInfo->info.state.committed = pVnode->state.applied;
   pInfo->info.state.commitTerm = pVnode->state.applyTerm;
   pInfo->info.state.commitID = ++pVnode->state.commitID;
-  pInfo->vers.start = lastCommitted + 1;
-  pInfo->vers.end = pInfo->info.state.committed;
   pInfo->pVnode = pVnode;
   pInfo->txn = metaGetTxn(pVnode->pMeta);