refact tsdbFile.c

src/inc/tfs.h

@@ -68,6 +68,8 @@ typedef struct {
 
 void  tfsInitFile(TFILE *pf, int level, int id, const char *bname);
 bool  tfsIsSameFile(TFILE *pf1, TFILE *pf2);
+int   tfsEncodeFile(void **buf, TFILE *pf);
+void *tfsDecodeFile(void *buf, TFILE *pf);
 void  tfsbasename(const TFILE *pf, char *dest);
 void  tfsdirname(const TFILE *pf, char *dest);
 

src/os/src/detail/osFile.c

@@ -128,7 +128,7 @@ int64_t taosCopy(char *from, char *to) {
   fidfrom = open(from, O_RDONLY);
   if (fidfrom < 0) goto _err;
 
-  fidto = open(to, O_WRONLY | O_CREAT, 0755);
+  fidto = open(to, O_WRONLY | O_CREAT | O_EXCL, 0755);
   if (fidto < 0) goto _err;
 
   while (true) {
@@ -149,6 +149,7 @@ int64_t taosCopy(char *from, char *to) {
 _err:
   if (fidfrom >= 0) close(fidfrom);
   if (fidto >= 0) close(fidto);
+  remove(to);
   return -1;
 }
 

src/tfs/inc/tfsint.h

@@ -19,6 +19,7 @@
 #include "tlog.h"
 #include "tglobal.h"
 #include "tfs.h"
+#include "tcoding.h"
 
 #ifdef __cplusplus
 extern "C" {

src/tfs/src/tfs.c

@@ -196,6 +196,30 @@ bool tfsIsSameFile(TFILE *pf1, TFILE *pf2) {
   return true;
 }
 
+int tfsEncodeFile(void **buf, TFILE *pf) {
+  int tlen = 0;
+
+  tlen += taosEncodeVariantI32(buf, pf->level);
+  tlen += taosEncodeVariantI32(buf, pf->id);
+  tlen += taosEncodeString(buf, pf->rname);
+
+  return tlen;
+}
+
+void *tfsDecodeFile(void *buf, TFILE *pf) {
+  int32_t level, id;
+  char *  rname;
+
+  buf = taosDecodeVariantI32(buf, &(level));
+  buf = taosDecodeVariantI32(buf, &(id));
+  buf = taosDecodeString(buf, &rname);
+
+  tfsInitFile(pf, level, id, rname);
+
+  tfree(rname);
+  return buf;
+}
+
 void tfsbasename(const TFILE *pf, char *dest) {
   char tname[TSDB_FILENAME_LEN] = "\0";
 

src/tsdb/inc/tsdbFile.h

@@ -27,8 +27,8 @@ extern "C" {
 #define TSDB_FILE_INFO(tf) (&((tf)->info))
 #define TSDB_FILE_F(tf) (&((tf)->f))
 #define TSDB_FILE_FD(tf) ((tf)->fd)
-#define TSDB_FILE_FULL_NAME(f) TFILE_NAME(TSDB_FILE_F(f))
-#define TSDB_FILE_OPENED(f) (TSDB_FILE_FD(f) >= 0)
+#define TSDB_FILE_FULL_NAME(tf) TFILE_NAME(TSDB_FILE_F(tf))
+#define TSDB_FILE_OPENED(tf) (TSDB_FILE_FD(tf) >= 0)
 #define TSDB_FILE_SET_CLOSED(f) (TSDB_FILE_FD(f) = -1)
 #define TSDB_FILE_LEVEL(tf) TFILE_LEVEL(TSDB_FILE_F(tf))
 #define TSDB_FILE_ID(tf) TFILE_ID(TSDB_FILE_F(tf))
@@ -57,7 +57,8 @@ typedef struct {
   int     fd;
 } SMFile;
 
-void  tsdbInitMFile(SMFile* pMFile, int vid, int ver, SMFInfo* pInfo);
+void  tsdbInitMFile(SMFile* pMFile, SDiskID did, int vid, int ver);
+void  tsdbInitMFileEx(SMFile* pMFile, SMFile* pOMFile);
 int   tsdbEncodeSMFile(void** buf, SMFile* pMFile);
 void* tsdbDecodeSMFile(void* buf, SMFile* pMFile);
 
@@ -108,7 +109,47 @@ static FORCE_INLINE void tsdbUpdateMFileMagic(SMFile* pMFile, void* pCksum) {
   pMFile->info.magic = taosCalcChecksum(pMFile->info.magic, (uint8_t*)(pCksum), sizeof(TSCKSUM));
 }
 
-static FORCE_INLINE int64_t tsdbTellMFile(SMFile* pMFile) { return tsdbSeekMFile(pMFile, 0, SEEK_CUR); }
+static FORCE_INLINE int tsdbAppendMFile(SMFile* pMFile, void* buf, int64_t nbyte, int64_t* offset) {
+  ASSERT(TSDB_FILE_OPENED(pMFile));
+
+  int64_t toffset;
+
+  if ((toffset = tsdbSeekMFile(pMFile, 0, SEEK_END)) < 0) {
+    return -1;
+  }
+
+  ASSERT(pMFile->info.size == toffset);
+
+  if (offset) {
+    *offset = toffset;
+  }
+
+  if (tsdbWriteMFile(pMFile, buf, nbyte) < 0) {
+    return -1;
+  }
+
+  pMFile->info.size += nbyte;
+
+  return 0;
+}
+
+int tsdbCreateMFile(SMFile *pMFile);
+
+static FORCE_INLINE int tsdbRemoveMFile(SMFile* pMFile) { return tfsremove(TSDB_FILE_F(pMFile)); }
+
+int tsdbUpdateMFileHeader(SMFile* pMFile);
+
+static FORCE_INLINE int64_t tsdbReadMFile(SMFile* pMFile, void* buf, int64_t nbyte) {
+  ASSERT(TSDB_FILE_OPENED(pMFile));
+
+  int64_t nread = taosRead(pMFile->fd, buf, nbyte);
+  if (nread < 0) {
+    terrno = TAOS_SYSTEM_ERROR(errno);
+    return -1;
+  }
+
+  return nread;
+}
 
 // =============== SDFile
 typedef struct {
@@ -127,17 +168,15 @@ typedef struct {
   int     fd;
 } SDFile;
 
-void  tsdbInitDFile(SDFile* pDFile, int vid, int fid, int ver, int level, int id, const SDFInfo* pInfo,
-                    TSDB_FILE_T ftype);
-void  tsdbInitDFileWithOld(SDFile* pDFile, SDFile* pOldDFile);
+void  tsdbInitDFile(SDFile* pDFile, SDiskID did, int vid, int fid, uint32_t ver, TSDB_FILE_T ftype);
+void  tsdbInitDFileEx(SDFile* pDFile, SDFile* pODFile);
 int   tsdbEncodeSDFile(void** buf, SDFile* pDFile);
 void* tsdbDecodeSDFile(void* buf, SDFile* pDFile);
-int   tsdbUpdateDFileHeader(SDFile *pDFile);
 
-static FORCE_INLINE int tsdbOpenDFile(SDFile *pDFile, int flags) {
+static FORCE_INLINE int tsdbOpenDFile(SDFile* pDFile, int flags) {
   ASSERT(!TSDB_FILE_OPENED(pDFile));
 
-  pDFile->fd = open(pDFile->f.aname, flags);
+  pDFile->fd = open(TSDB_FILE_FULL_NAME(pDFile), flags);
   if (pDFile->fd < 0) {
     terrno = TAOS_SYSTEM_ERROR(errno);
     return -1;
@@ -156,7 +195,7 @@ static FORCE_INLINE void tsdbCloseDFile(SDFile* pDFile) {
 static FORCE_INLINE int64_t tsdbSeekDFile(SDFile *pDFile, int64_t offset, int whence) {
   ASSERT(TSDB_FILE_OPENED(pDFile));
 
-  int64_t loffset = taosLSeek(pDFile->fd, offset, whence);
+  int64_t loffset = taosLSeek(TSDB_FILE_FD(pDFile), offset, whence);
   if (loffset < 0) {
     terrno = TAOS_SYSTEM_ERROR(errno);
     return -1;
@@ -177,19 +216,40 @@ static FORCE_INLINE int64_t tsdbWriteDFile(SDFile* pDFile, void* buf, int64_t nb
   return nwrite;
 }
 
-static FORCE_INLINE int64_t tsdbAppendDFile(SDFile* pDFile, void* buf, int64_t nbyte, int64_t* offset) {
+static FORCE_INLINE void tsdbUpdateDFileMagic(SDFile* pDFile, void* pCksm) {
+  pDFile->info.magic = taosCalcChecksum(pDFile->info.magic, (uint8_t*)(pCksm), sizeof(TSCKSUM));
+}
+
+static FORCE_INLINE int tsdbAppendDFile(SDFile* pDFile, void* buf, int64_t nbyte, int64_t* offset) {
   ASSERT(TSDB_FILE_OPENED(pDFile));
-  int64_t nwrite;
 
-  *offset = tsdbSeekDFile(pDFile, 0, SEEK_SET);
-  if (*offset < 0) return -1;
+  int64_t toffset;
 
-  nwrite = tsdbWriteDFile(pDFile, buf, nbyte);
-  if (nwrite < 0) return nwrite;
+  if ((toffset = tsdbSeekDFile(pDFile, 0, SEEK_END)) < 0) {
+    return -1;
+  }
 
-  return nwrite;
+  ASSERT(pDFile->info.size == toffset);
+
+  if (offset) {
+    *offset = toffset;
+  }
+
+  if (tsdbWriteDFile(pDFile, buf, nbyte) < 0) {
+    return -1;
+  }
+
+  pDFile->info.size += nbyte;
+
+  return 0;
 }
 
+int tsdbCreateDFile(SDFile* pDFile);
+
+static FORCE_INLINE int tsdbRemoveDFile(SDFile* pDFile) { return tfsremove(TSDB_FILE_F(pDFile)); }
+
+int tsdbUpdateDFileHeader(SDFile* pDFile);
+
 static FORCE_INLINE int64_t tsdbReadDFile(SDFile* pDFile, void* buf, int64_t nbyte) {
   ASSERT(TSDB_FILE_OPENED(pDFile));
 
@@ -202,25 +262,13 @@ static FORCE_INLINE int64_t tsdbReadDFile(SDFile* pDFile, void* buf, int64_t nby
   return nread;
 }
 
-static FORCE_INLINE int64_t tsdbTellDFile(SDFile *pDFile) { return tsdbSeekDFile(pDFile, 0, SEEK_CUR); }
-
-static FORCE_INLINE void tsdbUpdateDFileMagic(SDFile* pDFile, void* pCksm) {
-  pDFile->info.magic = taosCalcChecksum(pDFile->info.magic, (uint8_t*)(pCksm), sizeof(TSCKSUM));
-}
-
-static FORCE_INLINE int tsdbCreateAndOpenDFile(SDFile* pDFile) {
-  if (tsdbOpenDFile(pDFile, O_WRONLY | O_CREAT | O_EXCL) < 0) {
-    return -1;
-  }
-
-  pDFile->info.size += TSDB_FILE_HEAD_SIZE;
-
-  if (tsdbUpdateDFileHeader(pDFile) < 0) {
-    tsdbCloseDFile(pDFile);
-    remove(TSDB_FILE_FULL_NAME(pDFile));
+static FORCE_INLINE int tsdbCopyDFile(SDFile* pSrc, SDFile* pDest) {
+  if (tfscopy(TSDB_FILE_F(pSrc), TSDB_FILE_F(pDest)) < 0) {
+    terrno = TAOS_SYSTEM_ERROR(errno);
     return -1;
   }
 
+  pDest->info = pSrc->info;
   return 0;
 }
 
@@ -236,13 +284,47 @@ typedef struct {
 #define TSDB_FSET_LEVEL(s) TSDB_FILE_LEVEL(TSDB_DFILE_IN_SET(s, 0))
 #define TSDB_FSET_ID(s) TSDB_FILE_ID(TSDB_DFILE_IN_SET(s, 0))
 
-void tsdbInitDFileSet(SDFileSet* pSet, int vid, int fid, int ver, int level, int id);
-void tsdbInitDFileSetWithOld(SDFileSet* pSet, SDFileSet* pOldSet);
-int  tsdbOpenDFileSet(SDFileSet* pSet, int flags);
-void tsdbCloseDFileSet(SDFileSet* pSet);
+void  tsdbInitDFileSet(SDFileSet* pSet, SDiskID did, int vid, int fid, int ver);
+void  tsdbInitDFileSetEx(SDFileSet* pSet, SDFileSet* pOSet);
+int   tsdbEncodeDFileSet(void** buf, SDFileSet* pSet);
+void* tsdbDecodeDFileSet(void* buf, SDFileSet* pSet);
+
+static FORCE_INLINE void tsdbCloseDFileSet(SDFileSet* pSet) {
+  for (TSDB_FILE_T ftype = 0; ftype < TSDB_FILE_MAX; ftype++) {
+    tsdbCloseDFile(TSDB_DFILE_IN_SET(pSet, ftype));
+  }
+}
+
+static FORCE_INLINE int tsdbOpenDFileSet(SDFileSet* pSet, int flags) {
+  for (TSDB_FILE_T ftype = 0; ftype < TSDB_FILE_MAX; ftype++) {
+    if (tsdbOpenDFile(TSDB_DFILE_IN_SET(pSet, ftype), flags) < 0) {
+      tsdbCloseDFileSet(pSet);
+      return -1;
+    }
+  }
+  return 0;
+}
+
+int tsdbCreateDFileSet(SDFileSet *pSet);
+
+static FORCE_INLINE void tsdbRemoveDFileSet(SDFileSet* pSet) {
+  for (TSDB_FILE_T ftype = 0; ftype < TSDB_FILE_MAX; ftype++) {
+    tsdbRemoveDFile(TSDB_DFILE_IN_SET(pSet, ftype));
+  }
+}
+
 int tsdbUpdateDFileSetHeader(SDFileSet* pSet);
-int  tsdbCopyDFileSet(SDFileSet src, int tolevel, int toid, SDFileSet* pDest);
-int  tsdbCopyDFileSet(SDFileSet src, int tolevel, int toid, SDFileSet* pDest);
+
+static FORCE_INLINE int tsdbCopyDFileSet(SDFileSet* pSrc, SDFileSet* pDest) {
+  for (TSDB_FILE_T ftype = 0; ftype < TSDB_FILE_MAX; ftype++) {
+    if (tsdbCopyDFile(TSDB_DFILE_IN_SET(pSrc, ftype), TSDB_DFILE_IN_SET(pDest, ftype)) < 0) {
+      tsdbRemoveDFileSet(pDest);
+      return -1;
+    }
+  }
+
+  return 0;
+}
 
 #ifdef __cplusplus
 }

src/tsdb/src/tsdbFile.c

@@ -24,23 +24,22 @@ static const char *TSDB_FNAME_SUFFIX[] = {
     "manifest"  // TSDB_FILE_MANIFEST
 };
 
-#define tsdbOpenFile(T, f) tsdbOpenT
-
 // ============== SMFile
-void tsdbInitMFile(SMFile *pMFile, int vid, int ver, SMFInfo *pInfo) {
+void tsdbInitMFile(SMFile *pMFile, SDiskID did, int vid, uint32_t ver) {
   char fname[TSDB_FILENAME_LEN];
 
   TSDB_FILE_SET_CLOSED(pMFile);
 
-  if (pInfo == NULL) {
   memset(&(pMFile->info), 0, sizeof(pMFile->info));
   pMFile->info.magic = TSDB_FILE_INIT_MAGIC;
-  } else {
-    pMFile->info = *pInfo;
-  }
 
   tsdbGetFilename(vid, 0, ver, TSDB_FILE_META, fname);
-  tfsInitFile(TSDB_FILE_F(pMFile), TFS_PRIMARY_LEVEL, TFS_PRIMARY_ID, fname);
+  tfsInitFile(TSDB_FILE_F(pMFile), did.level, did.id, fname);
+}
+
+void tsdbInitMFileEx(SMFile *pMFile, SMFile *pOMFile) {
+  *pMFile = *pOMFile;
+  TSDB_FILE_SET_CLOSED(pMFile);
 }
 
 int tsdbEncodeSMFile(void **buf, SMFile *pMFile) {
@@ -59,6 +58,46 @@ void *tsdbDecodeSMFile(void *buf, SMFile *pMFile) {
   return buf;
 }
 
+int tsdbCreateMFile(SMFile *pMFile) {
+  ASSERT(pMFile->info.size == 0 && pMFile->info.magic == TSDB_FILE_INIT_MAGIC);
+
+  char buf[TSDB_FILE_HEAD_SIZE] = "\0";
+
+  if (tsdbOpenMFile(pMFile, O_WRONLY | O_CREAT | O_EXCL) < 0) {
+    return -1;
+  }
+
+  void *ptr = buf;
+  tsdbEncodeMFInfo(&ptr, &(pMFile->info));
+
+  if (tsdbWriteMFile(pMFile, buf, TSDB_FILE_HEAD_SIZE) < 0) {
+    tsdbCloseMFile(pMFile);
+    tsdbRemoveMFile(pMFile);
+    return -1;
+  }
+
+  pMFile->info.size += TSDB_FILE_HEAD_SIZE;
+
+  return 0;
+}
+
+int tsdbUpdateMFileHeader(SMFile *pMFile) {
+  char buf[TSDB_FILE_HEAD_SIZE] = "\0";
+
+  if (tsdbSeekMFile(pMFile, 0, SEEK_SET) < 0) {
+    return -1;
+  }
+
+  void *ptr = buf;
+  tsdbEncodeMFInfo(&ptr, &(pMFile->info));
+
+  if (tsdbWriteMFile(pMFile, buf, TSDB_FILE_HEAD_SIZE) < 0) {
+    return -1;
+  }
+
+  return 0;
+}
+
 static int tsdbEncodeMFInfo(void **buf, SMFInfo *pInfo) {
   int tlen = 0;
 
@@ -82,24 +121,20 @@ static void *tsdbDecodeMFInfo(void *buf, SMFInfo *pInfo) {
 }
 
 // ============== Operations on SDFile
-void tsdbInitDFile(SDFile *pDFile, int vid, int fid, uint32_t ver, int level, int id, const SDFInfo *pInfo,
-                   TSDB_FILE_T ftype) {
+void tsdbInitDFile(SDFile *pDFile, SDiskID did, int vid, int fid, uint32_t ver, TSDB_FILE_T ftype) {
   char fname[TSDB_FILENAME_LEN];
 
   TSDB_FILE_SET_CLOSED(pDFile);
 
-  if (pInfo == NULL) {
   memset(&(pDFile->info), 0, sizeof(pDFile->info));
   pDFile->info.magic = TSDB_FILE_INIT_MAGIC;
-  } else {
-    pDFile->info = *pInfo;
-  }
 
-  tfsInitFile(&(pDFile->f), level, id, NULL /*TODO*/);
+  tsdbGetFilename(vid, 0, ver, ftype, fname);
+  tfsInitFile(&(pDFile->f), level, id, fname);
 }
 
-void tsdbInitDFileWithOld(SDFile *pDFile, SDFile *pOldDFile) {
-  *pDFile = *pOldDFile;
+void tsdbInitDFileEx(SDFile *pDFile, SDFile *pODFile) {
+  *pDFile = *pODFile;
   TSDB_FILE_SET_CLOSED(pDFile);
 }
 
@@ -119,22 +154,44 @@ void *tsdbDecodeSDFile(void *buf, SDFile *pDFile) {
   return buf;
 }
 
-int tsdbUpdateDFileHeader(SDFile *pDFile) {
-  // TODO
+int tsdbCreateDFile(SDFile *pDFile) {
+  ASSERT(pDFile->info.size == 0 && pDFile->info.magic == TSDB_FILE_INIT_MAGIC);
+
+  char buf[TSDB_FILE_HEAD_SIZE] = "\0";
+
+  if (tsdbOpenDFile(pDFile, O_WRONLY | O_CREAT | O_EXCL) < 0) {
+    return -1;
+  }
+
+  void *ptr = buf;
+  tsdbEncodeDFInfo(&ptr, &(pDFile->info));
+
+  if (tsdbWriteDFile(pDFile, buf, TSDB_FILE_HEAD_SIZE) < 0) {
+    tsdbCloseDFile(pDFile);
+    tsdbRemoveDFile(pDFile);
+    return -1;
+  }
+
+  pDFile->info.size += TSDB_FILE_HEAD_SIZE;
+
   return 0;
 }
 
-static int tsdbCopyDFile(SDFile *pSrc, int tolevel, int toid, SDFile *pDest) {
-  TSDB_FILE_SET_CLOSED(pDest);
-
-  pDest->info = pSrc->info;
-  tfsInitFile(TSDB_FILE_F(pDest), tolevel, toid, TFILE_REL_NAME(TSDB_FILE_F(pSrc)));
+int tsdbUpdateDFileHeader(SDFile *pDFile) {
+  char buf[TSDB_FILE_HEAD_SIZE] = "\0";
 
-  if (taosCopy(TSDB_FILE_FULL_NAME(pSrc), TSDB_FILE_FULL_NAME(pDest)) < 0) {
-    terrno = TAOS_SYSTEM_ERROR(errno);
+  if (tsdbSeekDFile(pDFile, 0, SEEK_SET) < 0) {
     return -1;
   }
+
+  void *ptr = buf;
+  tsdbEncodeDFInfo(&ptr, &(pDFile->info));
+
+  if (tsdbWriteDFile(pDFile, buf, TSDB_FILE_HEAD_SIZE) < 0) {
     return -1;
+  }
+
+  return 0;
 }
 
 static int tsdbEncodeDFInfo(void **buf, SDFInfo *pInfo) {
@@ -164,60 +221,58 @@ static void *tsdbDecodeDFInfo(void *buf, SDFInfo *pInfo) {
 }
 
 // ============== Operations on SDFileSet
-void tsdbInitDFileSet(SDFileSet *pSet, int vid, int fid, uint32_t ver, int level, int id) {
+void tsdbInitDFileSet(SDFileSet *pSet, SDiskID did, int vid, int fid, uint32_t ver) {
   pSet->fid = fid;
   pSet->state = 0;
 
   for (TSDB_FILE_T ftype = 0; ftype < TSDB_FILE_MAX; ftype++) {
     SDFile *pDFile = TSDB_DFILE_IN_SET(pSet, ftype);
-    tsdbInitDFile(pDFile, vid, fid, ver, level, id, NULL, ftype);
+    tsdbInitDFile(pDFile, did, vid, fid, ver, ftype);
   }
 }
 
-void tsdbInitDFileSetWithOld(SDFileSet *pSet, SDFileSet *pOldSet) {
+void tsdbInitDFileSetEx(SDFileSet *pSet, SDFileSet *pOSet) {
   for (TSDB_FILE_T ftype = 0; ftype < TSDB_FILE_MAX; ftype++) {
-    tsdbInitDFileWithOld(TSDB_DFILE_IN_SET(pSet, ftype), TSDB_DFILE_IN_SET(pOldSet, ftype));
+    tsdbInitDFileEx(TSDB_DFILE_IN_SET(pSet, ftype), TSDB_DFILE_IN_SET(pOSet, ftype));
   }
 }
 
-int tsdbOpenDFileSet(SDFileSet *pSet, int flags) {
-  for (TSDB_FILE_T ftype = 0; ftype < TSDB_FILE_MAX; ftype++) {
-    SDFile *pDFile = TSDB_DFILE_IN_SET(pSet, ftype);
+int tsdbEncodeDFileSet(void **buf, SDFileSet *pSet) {
+  int tlen = 0;
 
-    if (tsdbOpenDFile(pDFile, flags) < 0) {
-      tsdbCloseDFileSet(pSet);
-      return -1;
-    }
+  for (TSDB_FILE_T ftype = 0; ftype < TSDB_FILE_MAX; ftype++) {
+    tlen += tsdbEncodeSDFile(buf, TSDB_DFILE_IN_SET(pSet, ftype));
   }
+
+  return tlen
 }
 
-void tsdbCloseDFileSet(SDFileSet *pSet) {
+void *tsdbDecodeDFileSet(void *buf, SDFileSet *pSet) {
   for (TSDB_FILE_T ftype = 0; ftype < TSDB_FILE_MAX; ftype++) {
-    SDFile *pDFile = TSDB_DFILE_IN_SET(pSet, ftype);
-    tsdbCloseDFile(pDFile);
+    buf = tsdbDecodeSDFile(buf, TSDB_DFILE_IN_SET(pSet, ftype));
   }
+  return buf;
 }
 
-int tsdbUpdateDFileSetHeader(SDFileSet *pSet) {
-  // TODO
+int tsdbCreateDFileSet(SDFileSet *pSet) {
+  for (TSDB_FILE_T ftype = 0; ftype < TSDB_FILE_MAX; ftype++) {
+    if (tsdbCreateDFile(TSDB_DFILE_IN_SET(pSet, ftype)) < 0) {
+      tsdbCloseDFileSet(pSet);
+      tsdbRemoveDFileSet(pSet);
+      return -1;
+    }
+  }
+
   return 0;
 }
 
-int tsdbCopyDFileSet(SDFileSet src, int tolevel, int toid, SDFileSet *pDest) {
-  ASSERT(tolevel > TSDB_FSET_LEVEL(&src));
-
+int tsdbUpdateDFileSetHeader(SDFileSet *pSet) {
   for (TSDB_FILE_T ftype = 0; ftype < TSDB_FILE_MAX; ftype++) {
-    if (tsdbCopyDFile(TSDB_DFILE_IN_SET(&src, ftype), tolevel, toid, TSDB_DFILE_IN_SET(pDest, ftype)) < 0) {
-      while (ftype >= 0) {
-        remove(TSDB_FILE_FULL_NAME(TSDB_DFILE_IN_SET(pDest, ftype)));
-        ftype--;
-      }
-
+    if (tsdbUpdateDFileHeader(TSDB_DFILE_IN_SET(pSet, ftype)) < 0) {
       return -1;
     }
   }
-
-  return 0;
+  return 0
 }
 
 static void tsdbGetFilename(int vid, int fid, uint32_t ver, TSDB_FILE_T ftype, char *fname) {