From 68cb86602eff35725e39592c054ab22954ee9cb6 Mon Sep 17 00:00:00 2001
From: Benguang Zhao <bgzhao@taosdata.com>
Date: Fri, 29 Dec 2023 11:37:34 +0800
Subject: [PATCH] fix: reuse cid with fs eid updated in
 tsdbFSetRAWWriteFileDataBegin

---
 source/dnode/vnode/src/tsdb/tsdbFS2.c     | 6 ++++++
 source/dnode/vnode/src/tsdb/tsdbFS2.h     | 1 +
 source/dnode/vnode/src/tsdb/tsdbFSetRAW.c | 6 ++++--
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/source/dnode/vnode/src/tsdb/tsdbFS2.c b/source/dnode/vnode/src/tsdb/tsdbFS2.c
index b2ccc3e859..1d2fd60df2 100644
--- a/source/dnode/vnode/src/tsdb/tsdbFS2.c
+++ b/source/dnode/vnode/src/tsdb/tsdbFS2.c
@@ -805,6 +805,12 @@ int64_t tsdbFSAllocEid(STFileSystem *fs) {
   return cid;
 }
 
+void tsdbFSUpdateEid(STFileSystem *fs, int64_t cid) {
+  taosThreadMutexLock(&fs->tsdb->mutex);
+  fs->neid = TMAX(fs->neid, cid);
+  taosThreadMutexUnlock(&fs->tsdb->mutex);
+}
+
 int32_t tsdbFSEditBegin(STFileSystem *fs, const TFileOpArray *opArray, EFEditT etype) {
   int32_t code = 0;
   int32_t lino;
diff --git a/source/dnode/vnode/src/tsdb/tsdbFS2.h b/source/dnode/vnode/src/tsdb/tsdbFS2.h
index 714bf5bf16..7099ce8b26 100644
--- a/source/dnode/vnode/src/tsdb/tsdbFS2.h
+++ b/source/dnode/vnode/src/tsdb/tsdbFS2.h
@@ -52,6 +52,7 @@ int32_t tsdbFSCreateRefRangedSnapshot(STFileSystem *fs, int64_t sver, int64_t ev
 int32_t tsdbFSDestroyRefRangedSnapshot(TFileSetRangeArray **fsrArr);
 //  txn
 int64_t tsdbFSAllocEid(STFileSystem *fs);
+void    tsdbFSUpdateEid(STFileSystem *fs, int64_t cid);
 int32_t tsdbFSEditBegin(STFileSystem *fs, const TFileOpArray *opArray, EFEditT etype);
 int32_t tsdbFSEditCommit(STFileSystem *fs);
 int32_t tsdbFSEditAbort(STFileSystem *fs);
diff --git a/source/dnode/vnode/src/tsdb/tsdbFSetRAW.c b/source/dnode/vnode/src/tsdb/tsdbFSetRAW.c
index 03c12502d5..ddb8e7e27e 100644
--- a/source/dnode/vnode/src/tsdb/tsdbFSetRAW.c
+++ b/source/dnode/vnode/src/tsdb/tsdbFSetRAW.c
@@ -14,6 +14,7 @@
  */
 
 #include "tsdbFSetRAW.h"
+#include "tsdbFS2.h"
 
 // SFSetRAWWriter ==================================================
 typedef struct SFSetRAWWriter {
@@ -76,7 +77,7 @@ static int32_t tsdbFSetRAWWriteFileDataBegin(SFSetRAWWriter *writer, STsdbDataRA
       .szPage = writer->config->szPage,
       .fid = bHdr->file.fid,
       .did = writer->config->did,
-      .cid = writer->config->cid,
+      .cid = bHdr->file.cid,
       .level = writer->config->level,
 
       .file =
@@ -84,7 +85,7 @@ static int32_t tsdbFSetRAWWriteFileDataBegin(SFSetRAWWriter *writer, STsdbDataRA
               .type = bHdr->file.type,
               .fid = bHdr->file.fid,
               .did = writer->config->did,
-              .cid = writer->config->cid,
+              .cid = bHdr->file.cid,
               .size = bHdr->file.size,
               .minVer = bHdr->file.minVer,
               .maxVer = bHdr->file.maxVer,
@@ -94,6 +95,7 @@ static int32_t tsdbFSetRAWWriteFileDataBegin(SFSetRAWWriter *writer, STsdbDataRA
           },
   };
 
+  tsdbFSUpdateEid(config.tsdb->pFS, config.cid);
   writer->ctx->offset = 0;
   writer->ctx->file = config.file;