diff --git a/source/dnode/vnode/src/inc/tsdb.h b/source/dnode/vnode/src/inc/tsdb.h
index 6686789e12..7ad16e5583 100644
--- a/source/dnode/vnode/src/inc/tsdb.h
+++ b/source/dnode/vnode/src/inc/tsdb.h
@@ -164,8 +164,6 @@ int32_t tGetMapData(uint8_t *p, SMapData *pMapData);
 int32_t tsdbKeyFid(TSKEY key, int32_t minutes, int8_t precision);
 void    tsdbFidKeyRange(int32_t fid, int32_t minutes, int8_t precision, TSKEY *minKey, TSKEY *maxKey);
 int32_t tsdbBuildDeleteSkyline(SArray *aDelData, int32_t sidx, int32_t eidx, SArray *aSkyline);
-int32_t tPutDelFileHdr(uint8_t *p, SDelFile *pDelFile);
-int32_t tGetDelFileHdr(uint8_t *p, SDelFile *pDelFile);
 // tsdbMemTable ==============================================================================================
 // SMemTable
 int32_t tsdbMemTableCreate(STsdb *pTsdb, SMemTable **ppMemTable);
@@ -181,10 +179,11 @@ bool     tsdbTbDataIterNext(STbDataIter *pIter);
 typedef enum { TSDB_HEAD_FILE = 0, TSDB_DATA_FILE, TSDB_LAST_FILE, TSDB_SMA_FILE } EDataFileT;
 void    tsdbDataFileName(STsdb *pTsdb, SDFileSet *pDFileSet, EDataFileT ftype, char fname[]);
 int32_t tPutDataFileHdr(uint8_t *p, SDFileSet *pSet, EDataFileT ftype);
+int32_t tPutDelFile(uint8_t *p, SDelFile *pDelFile);
+int32_t tGetDelFile(uint8_t *p, SDelFile *pDelFile);
+int32_t tPutDFileSet(uint8_t *p, SDFileSet *pSet);
+int32_t tGetDFileSet(uint8_t *p, SDFileSet *pSet);
 // SDelFile
-#define tsdbDelFileCreate() \
-  ((SDelFile){              \
-      .maxKey = TSKEY_MIN, .minKey = TSKEY_MAX, .maxVersion = -1, .minVersion = INT64_MAX, .size = 0, .offset = 0})
 void tsdbDelFileName(STsdb *pTsdb, SDelFile *pFile, char fname[]);
 // tsdbFS.c ==============================================================================================
 int32_t tsdbFSOpen(STsdb *pTsdb, STsdbFS **ppFS);
diff --git a/source/dnode/vnode/src/tsdb/tsdbCommit.c b/source/dnode/vnode/src/tsdb/tsdbCommit.c
index 1fba5005a1..d9fae3ea64 100644
--- a/source/dnode/vnode/src/tsdb/tsdbCommit.c
+++ b/source/dnode/vnode/src/tsdb/tsdbCommit.c
@@ -816,6 +816,50 @@ _err:
   return code;
 }
 
+static int32_t tsdbMergeMemDisk(SCommitter *pCommitter, STbData *pTbData, SBlockIdx *oBlockIdx) {
+  int32_t      code = 0;
+  STbDataIter *pIter = &(STbDataIter){0};
+  TSDBROW     *pRow;
+
+  // create iter
+  tsdbTbDataIterOpen(pTbData, &(TSDBKEY){.ts = pCommitter->minKey, .version = VERSION_MIN}, 0, pIter);
+  pRow == tsdbTbDataIterGet(pIter);
+  if (pRow == NULL || TSDBROW_TS(pRow) > pCommitter->maxKey) {
+    return tsdbCommitDiskData(pCommitter, oBlockIdx);
+  }
+
+  // read
+  code = tsdbReadBlock(pCommitter->pReader, oBlockIdx, &pCommitter->oBlockMap, NULL);
+  if (code) goto _err;
+
+  // loop to merge
+  SBlockData *pBlockData = &pCommitter->nBlockData;
+  int32_t     iBlock = 0;
+  int32_t     nBlock = pCommitter->oBlockMap.nItem;
+
+  tBlockDataReset(pBlockData);
+  while (true) {
+    if ((pRow == NULL || TSDBROW_TS(pRow) > pCommitter->maxKey) && iBlock >= nBlock) break;
+  }
+
+  while (iBlock < nBlock) {
+    /* code */
+  }
+
+  //
+  while (pRow && TSDBROW_TS(pRow) <= pCommitter->maxKey) {
+    /* code */
+  }
+
+_exit:
+  if (pRow) pCommitter->nextKey = TMIN(pCommitter->nextKey, TSDBROW_TS(pRow));
+  return code;
+
+_err:
+  tsdbError("vgId:%d tsdb merge mem disk data failed since %s", TD_VID(pCommitter->pTsdb->pVnode), tstrerror(code));
+  return code;
+}
+
 static int32_t tsdbCommitFileDataImpl(SCommitter *pCommitter) {
   int32_t    code = 0;
   int32_t    c;
@@ -843,8 +887,8 @@ static int32_t tsdbCommitFileDataImpl(SCommitter *pCommitter) {
 
     if (c == 0) {
       // merge commit
-      // code = tsdbMergeCommit(pCommitter, pTbData, pBlockIdx);
-      // if (code) goto _err;
+      code = tsdbMergeMemDisk(pCommitter, pTbData, pBlockIdx);
+      if (code) goto _err;
 
       iTbData++;
       iBlockIdx++;
@@ -1026,14 +1070,14 @@ _exit:
 }
 
 static void tsdbCommitDataEnd(SCommitter *pCommitter) {
-  tMapDataClear(&pCommitter->oBlockIdxMap);
-  tMapDataClear(&pCommitter->oBlockMap);
-  tBlockClear(&pCommitter->oBlock);
-  tBlockDataClear(&pCommitter->oBlockData);
-  tMapDataClear(&pCommitter->nBlockIdxMap);
-  tMapDataClear(&pCommitter->nBlockMap);
-  tBlockClear(&pCommitter->nBlock);
-  tBlockDataClear(&pCommitter->nBlockData);
+  // tMapDataClear(&pCommitter->oBlockIdxMap);
+  // tMapDataClear(&pCommitter->oBlockMap);
+  // tBlockClear(&pCommitter->oBlock);
+  // tBlockDataClear(&pCommitter->oBlockData);
+  // tMapDataClear(&pCommitter->nBlockIdxMap);
+  // tMapDataClear(&pCommitter->nBlockMap);
+  // tBlockClear(&pCommitter->nBlock);
+  // tBlockDataClear(&pCommitter->nBlockData);
 }
 
 static int32_t tsdbCommitData(SCommitter *pCommitter) {
@@ -1114,7 +1158,23 @@ static int32_t tsdbCommitCache(SCommitter *pCommitter) {
 }
 
 static int32_t tsdbEndCommit(SCommitter *pCommitter, int32_t eno) {
-  int32_t code = 0;
-  // TODO
+  int32_t    code = 0;
+  STsdb     *pTsdb = pCommitter->pTsdb;
+  SMemTable *pMemTable = pTsdb->imem;
+
+  if (eno == 0) {
+    code = tsdbFSCommit(pTsdb->fs);
+  } else {
+    code = tsdbFSRollback(pTsdb->fs);
+  }
+
+  tsdbMemTableDestroy(pMemTable);
+  pTsdb->imem = NULL;
+
+  tsdbInfo("vgId:%d tsdb end commit", TD_VID(pTsdb->pVnode));
+  return code;
+
+_err:
+  tsdbError("vgId:%d tsdb end commit failed since %s", TD_VID(pTsdb->pVnode), tstrerror(code));
   return code;
 }
diff --git a/source/dnode/vnode/src/tsdb/tsdbFS.c b/source/dnode/vnode/src/tsdb/tsdbFS.c
index 77edeab836..c6bbd809c0 100644
--- a/source/dnode/vnode/src/tsdb/tsdbFS.c
+++ b/source/dnode/vnode/src/tsdb/tsdbFS.c
@@ -16,158 +16,69 @@
 #include "tsdb.h"
 
 // =================================================================================================
-static int32_t tsdbDelFileToJson(const void *pObj, SJson *pJson) {
-  int32_t   code = 0;
-  SDelFile *pDelFile = (SDelFile *)pObj;
+static int32_t tPutFSState(uint8_t *p, STsdbFSState *pState) {
+  int32_t  n = 0;
+  int8_t   hasDel = pState->pDelFile ? 1 : 0;
+  uint32_t nDFileSet = taosArrayGetSize(pState->aDFileSet);
 
-  if (tjsonAddIntegerToObject(pJson, "minKey", pDelFile->minKey) < 0) goto _err;
-  if (tjsonAddIntegerToObject(pJson, "maxKey", pDelFile->maxKey) < 0) goto _err;
-  if (tjsonAddIntegerToObject(pJson, "minVer", pDelFile->minVersion) < 0) goto _err;
-  if (tjsonAddIntegerToObject(pJson, "maxVer", pDelFile->maxVersion) < 0) goto _err;
-
-  return code;
-
-_err:
-  code = TSDB_CODE_OUT_OF_MEMORY;
-  return code;
-}
-
-static int32_t tsdbHeadFileToJson(const void *pObj, SJson *pJson) {
-  int32_t    code = 0;
-  SHeadFile *pHeadFile = (SHeadFile *)pObj;
-
-  if (tjsonAddIntegerToObject(pJson, "size", pHeadFile->size) < 0) goto _err;
-  if (tjsonAddIntegerToObject(pJson, "offset", pHeadFile->offset) < 0) goto _err;
-
-  return code;
-
-_err:
-  code = TSDB_CODE_OUT_OF_MEMORY;
-  return code;
-}
-
-static int32_t tsdbDataFileToJson(const void *pObj, SJson *pJson) {
-  int32_t    code = 0;
-  SDataFile *pDataFile = (SDataFile *)pObj;
-
-  if (tjsonAddIntegerToObject(pJson, "size", pDataFile->size) < 0) goto _err;
-
-  return code;
-
-_err:
-  code = TSDB_CODE_OUT_OF_MEMORY;
-  return code;
-}
-
-static int32_t tsdbLastFileToJson(const void *pObj, SJson *pJson) {
-  int32_t    code = 0;
-  SLastFile *pLastFile = (SLastFile *)pObj;
-
-  if (tjsonAddIntegerToObject(pJson, "size", pLastFile->size) < 0) goto _err;
-
-  return code;
-
-_err:
-  code = TSDB_CODE_OUT_OF_MEMORY;
-  return code;
-}
-
-static int32_t tsdbSmaFileToJson(const void *pObj, SJson *pJson) {
-  int32_t   code = 0;
-  SSmaFile *pSmaFile = (SSmaFile *)pObj;
-
-  if (tjsonAddIntegerToObject(pJson, "size", pSmaFile->size) < 0) goto _err;
-
-  return code;
-
-_err:
-  code = TSDB_CODE_OUT_OF_MEMORY;
-  return code;
-}
-
-static int32_t tsdbDFileSetToJson(const void *pObj, SJson *pJson) {
-  int32_t    code = 0;
-  SDFileSet *pDFileSet = (SDFileSet *)pObj;
-
-  if (tjsonAddIntegerToObject(pJson, "level", pDFileSet->diskId.level) < 0) goto _err;
-  if (tjsonAddIntegerToObject(pJson, "id", pDFileSet->diskId.id) < 0) goto _err;
-  if (tjsonAddIntegerToObject(pJson, "fid", pDFileSet->fid) < 0) goto _err;
-  // if (tjsonAddObject(pJson, "head", tsdbHeadFileToJson, pDFileSet->pHeadFile) < 0) goto _err;
-  // if (tjsonAddObject(pJson, "data", tsdbDataFileToJson, pDFileSet->pDataFile) < 0) goto _err;
-  // if (tjsonAddObject(pJson, "last", tsdbLastFileToJson, pDFileSet->pLastFile) < 0) goto _err;
-  // if (tjsonAddObject(pJson, "sma", tsdbSmaFileToJson, pDFileSet->pSmaFile) < 0) goto _err;
-
-  return code;
-
-_err:
-  code = TSDB_CODE_OUT_OF_MEMORY;
-  return code;
-}
-
-static int32_t tsdbFSStateToJsonStr(STsdbFSState *pState, char **ppData) {
-  int32_t code = 0;
-  SJson  *pJson = NULL;
-
-  pJson = tjsonCreateObject();
-  if (pJson == NULL) {
-    code = TSDB_CODE_OUT_OF_MEMORY;
-    goto _err;
+  // SDelFile
+  n += tPutI8(p ? p + n : p, hasDel);
+  if (hasDel) {
+    n += tPutDelFile(p ? p + n : p, pState->pDelFile);
   }
 
-  if (tjsonAddObject(pJson, "DelFile", tsdbDelFileToJson, pState->pDelFile) < 0) {
-    code = TSDB_CODE_OUT_OF_MEMORY;
-    goto _err;
+  // SArray<SDFileSet>
+  n += tPutU32v(p ? p + n : p, nDFileSet);
+  for (uint32_t iDFileSet = 0; iDFileSet < nDFileSet; iDFileSet++) {
+    n += tPutDFileSet(p ? p + n : p, (SDFileSet *)taosArrayGet(pState->aDFileSet, iDFileSet));
   }
 
-  if (tjsonAddTArray(pJson, "DFileSet", tsdbDFileSetToJson, pState->aDFileSet) < 0) {
-    code = TSDB_CODE_OUT_OF_MEMORY;
-    goto _err;
-  }
-
-  *ppData = tjsonToString(pJson);
-  if (*ppData == NULL) {
-    code = TSDB_CODE_OUT_OF_MEMORY;
-    goto _err;
-  }
-
-  tjsonDelete(pJson);
-
-  return code;
-
-_err:
-  return code;
+  return n;
 }
 
-static int32_t tsdbJsonStrToFSState(char *pData, STsdbFSState *pState) {
-  int32_t code = 0;
-  SJson  *pJson = NULL;
+static int32_t tGetFSState(uint8_t *p, STsdbFSState *pState) {
+  int32_t    n = 0;
+  int8_t     hasDel;
+  uint32_t   nDFileSet;
+  SDFileSet *pSet = &(SDFileSet){0};
 
-  pJson = tjsonParse(pData);
-  if (pJson == NULL) goto _err;
+  // SDelFile
+  n += tGetI8(p + n, &hasDel);
+  if (hasDel) {
+    pState->pDelFile = &pState->delFile;
+    n += tGetDelFile(p + n, pState->pDelFile);
+  } else {
+    pState->pDelFile = NULL;
+  }
 
-  // if (tjsonToObject(pJson, "DelFile", tsdbJsonToDelFile, &pState->pDelFile) < 0) goto _err;
-  // if (tjsonToTArray(pJson, "DFIleSet", tsdbJsonToDFileSet, ) < 0) goto _err;
-  ASSERT(0);
+  // SArray<SDFileSet>
+  taosArrayClear(pState->aDFileSet);
+  n += tGetU32v(p + n, &nDFileSet);
+  for (uint32_t iDFileSet = 0; iDFileSet < nDFileSet; iDFileSet++) {
+    n += tGetDFileSet(p + n, pSet);
+    taosArrayPush(pState->aDFileSet, pSet);
+  }
 
-  tjsonDelete(pJson);
-
-  return code;
-
-_err:
-  code = TSDB_CODE_OUT_OF_MEMORY;
-  return code;
+  return n;
 }
 
-static int32_t tsdbCreateEmptyCurrent(const char *fname, STsdbFSState *pState) {
+static int32_t tsdbGnrtCurrent(const char *fname, STsdbFSState *pState) {
   int32_t   code = 0;
   int64_t   n;
   int64_t   size;
-  char     *pData = NULL;
+  uint8_t  *pData;
   TdFilePtr pFD = NULL;
 
-  // to json str
-  code = tsdbFSStateToJsonStr(pState, &pData);
-  if (code) goto _err;
+  // to binary
+  size = tPutFSState(NULL, pState) + sizeof(TSCKSUM);
+  pData = taosMemoryMalloc(size);
+  if (pData == NULL) {
+    code = TSDB_CODE_OUT_OF_MEMORY;
+    goto _err;
+  }
+  n = tPutFSState(pData, pState);
+  ASSERT(n + sizeof(TSCKSUM) == size);
+  taosCalcChecksumAppend(0, pData, size);
 
   // create and write
   pFD = taosOpenFile(fname, TD_FILE_WRITE | TD_FILE_CREATE);
@@ -176,7 +87,6 @@ static int32_t tsdbCreateEmptyCurrent(const char *fname, STsdbFSState *pState) {
     goto _err;
   }
 
-  size = strlen(pData);
   n = taosWriteFile(pFD, pData, size);
   if (n < 0) {
     code = TAOS_SYSTEM_ERROR(errno);
@@ -194,60 +104,7 @@ static int32_t tsdbCreateEmptyCurrent(const char *fname, STsdbFSState *pState) {
   return code;
 
 _err:
-  tsdbError("create empry current failed since %s", tstrerror(code));
-  if (pData) taosMemoryFree(pData);
-  return code;
-}
-
-static int32_t tsdbSaveCurrentState(STsdbFS *pFS, STsdbFSState *pState) {
-  int32_t   code = 0;
-  int64_t   n;
-  int64_t   size;
-  char      tfname[TSDB_FILENAME_LEN];
-  char      fname[TSDB_FILENAME_LEN];
-  char     *pData = NULL;
-  TdFilePtr pFD = NULL;
-
-  snprintf(tfname, TSDB_FILENAME_LEN - 1, "%s/CURRENT.t", pFS->pTsdb->path);
-  snprintf(fname, TSDB_FILENAME_LEN - 1, "%s/CURRENT", pFS->pTsdb->path);
-
-  // encode
-  code = tsdbFSStateToJsonStr(pState, &pData);
-  if (code) goto _err;
-
-  // create and write tfname
-  pFD = taosOpenFile(tfname, TD_FILE_WRITE | TD_FILE_CREATE | TD_FILE_TRUNC);
-  if (pFD == NULL) {
-    code = TAOS_SYSTEM_ERROR(errno);
-    goto _err;
-  }
-
-  size = strlen(pData);
-  n = taosWriteFile(pFD, pData, size);
-  if (n < 0) {
-    code = TAOS_SYSTEM_ERROR(errno);
-    goto _err;
-  }
-
-  if (taosFsyncFile(pFD) < 0) {
-    code = TAOS_SYSTEM_ERROR(errno);
-    goto _err;
-  }
-
-  taosCloseFile(&pFD);
-
-  // rename
-  code = taosRenameFile(tfname, fname);
-  if (code) {
-    code = TAOS_SYSTEM_ERROR(code);
-    goto _err;
-  }
-
-  if (pData) taosMemoryFree(pData);
-  return code;
-
-_err:
-  tsdbError("vgId:%d tsdb save current state failed since %s", TD_VID(pFS->pTsdb->pVnode), tstrerror(code));
+  tsdbError("tsdb gnrt current failed since %s", tstrerror(code));
   if (pData) taosMemoryFree(pData);
   return code;
 }
@@ -257,7 +114,7 @@ static int32_t tsdbLoadCurrentState(STsdbFS *pFS, STsdbFSState *pState) {
   int64_t   size;
   int64_t   n;
   char      fname[TSDB_FILENAME_LEN];
-  char     *pData = NULL;
+  uint8_t  *pData = NULL;
   TdFilePtr pFD;
 
   snprintf(fname, TSDB_FILENAME_LEN - 1, "%s%s%s%sCURRENT", tfsGetPrimaryPath(pFS->pTsdb->pVnode->pTfs), TD_DIRSEP,
@@ -265,7 +122,7 @@ static int32_t tsdbLoadCurrentState(STsdbFS *pFS, STsdbFSState *pState) {
 
   if (!taosCheckExistFile(fname)) {
     // create an empry CURRENT file if not exists
-    code = tsdbCreateEmptyCurrent(fname, pState);
+    code = tsdbGnrtCurrent(fname, pState);
     if (code) goto _err;
   } else {
     // open the file and load
@@ -280,12 +137,11 @@ static int32_t tsdbLoadCurrentState(STsdbFS *pFS, STsdbFSState *pState) {
       goto _err;
     }
 
-    pData = taosMemoryMalloc(size + 1);
+    pData = taosMemoryMalloc(size);
     if (pData == NULL) {
       code = TSDB_CODE_OUT_OF_MEMORY;
       goto _err;
     }
-    pData[size] = '\0';
 
     n = taosReadFile(pFD, pData, size);
     if (n < 0) {
@@ -293,11 +149,15 @@ static int32_t tsdbLoadCurrentState(STsdbFS *pFS, STsdbFSState *pState) {
       goto _err;
     }
 
+    if (!taosCheckChecksumWhole(pData, size)) {
+      code = TSDB_CODE_FILE_CORRUPTED;
+      goto _err;
+    }
+
     taosCloseFile(&pFD);
 
     // decode
-    code = tsdbJsonStrToFSState(pData, pState);
-    if (code) goto _err;
+    tGetFSState(pData, pState);
   }
 
   if (pData) taosMemoryFree(pData);
@@ -679,15 +539,29 @@ _err:
 int32_t tsdbFSCommit(STsdbFS *pFS) {
   int32_t       code = 0;
   STsdbFSState *pState = pFS->nState;
+  char          tfname[TSDB_FILENAME_LEN];
+  char          fname[TSDB_FILENAME_LEN];
 
   // need lock (todo)
   pFS->nState = pFS->cState;
   pFS->cState = pState;
 
-  // save
-  code = tsdbSaveCurrentState(pFS, pFS->cState);
+  snprintf(tfname, TSDB_FILENAME_LEN - 1, "%s%s%s%sCURRENT.t", tfsGetPrimaryPath(pFS->pTsdb->pVnode->pTfs), TD_DIRSEP,
+           pFS->pTsdb->path, TD_DIRSEP);
+  snprintf(fname, TSDB_FILENAME_LEN - 1, "%s%s%s%sCURRENT", tfsGetPrimaryPath(pFS->pTsdb->pVnode->pTfs), TD_DIRSEP,
+           pFS->pTsdb->path, TD_DIRSEP);
+
+  // gnrt CURRENT.t
+  code = tsdbGnrtCurrent(tfname, pFS->cState);
   if (code) goto _err;
 
+  // rename
+  code = taosRenameFile(tfname, fname);
+  if (code) {
+    code = TAOS_SYSTEM_ERROR(code);
+    goto _err;
+  }
+
   // apply commit on disk
   code = tsdbFSApplyDiskChange(pFS, pFS->nState, pFS->cState);
   if (code) goto _err;
diff --git a/source/dnode/vnode/src/tsdb/tsdbFile.c b/source/dnode/vnode/src/tsdb/tsdbFile.c
index 8449552047..18b215afad 100644
--- a/source/dnode/vnode/src/tsdb/tsdbFile.c
+++ b/source/dnode/vnode/src/tsdb/tsdbFile.c
@@ -15,6 +15,81 @@
 
 #include "tsdb.h"
 
+static int32_t tPutHeadFile(uint8_t *p, SHeadFile *pHeadFile) {
+  int32_t n = 0;
+
+  n += tPutI64v(p ? p + n : p, pHeadFile->commitID);
+  n += tPutI64v(p ? p + n : p, pHeadFile->size);
+  n += tPutI64v(p ? p + n : p, pHeadFile->offset);
+
+  return n;
+}
+
+static int32_t tGetHeadFile(uint8_t *p, SHeadFile *pHeadFile) {
+  int32_t n = 0;
+
+  n += tGetI64v(p + n, &pHeadFile->commitID);
+  n += tGetI64v(p + n, &pHeadFile->size);
+  n += tGetI64v(p + n, &pHeadFile->offset);
+
+  return n;
+}
+
+static int32_t tPutDataFile(uint8_t *p, SDataFile *pDataFile) {
+  int32_t n = 0;
+
+  n += tPutI64v(p ? p + n : p, pDataFile->commitID);
+  n += tPutI64v(p ? p + n : p, pDataFile->size);
+
+  return n;
+}
+
+static int32_t tGetDataFile(uint8_t *p, SDataFile *pDataFile) {
+  int32_t n = 0;
+
+  n += tGetI64v(p + n, &pDataFile->commitID);
+  n += tGetI64v(p + n, &pDataFile->size);
+
+  return n;
+}
+
+static int32_t tPutLastFile(uint8_t *p, SLastFile *pLastFile) {
+  int32_t n = 0;
+
+  n += tPutI64v(p ? p + n : p, pLastFile->commitID);
+  n += tPutI64v(p ? p + n : p, pLastFile->size);
+
+  return n;
+}
+
+static int32_t tGetLastFile(uint8_t *p, SLastFile *pLastFile) {
+  int32_t n = 0;
+
+  n += tGetI64v(p + n, &pLastFile->commitID);
+  n += tGetI64v(p + n, &pLastFile->size);
+
+  return n;
+}
+
+static int32_t tPutSmaFile(uint8_t *p, SSmaFile *pSmaFile) {
+  int32_t n = 0;
+
+  n += tPutI64v(p ? p + n : p, pSmaFile->commitID);
+  n += tPutI64v(p ? p + n : p, pSmaFile->size);
+
+  return n;
+}
+
+static int32_t tGetSmaFile(uint8_t *p, SSmaFile *pSmaFile) {
+  int32_t n = 0;
+
+  n += tGetI64v(p + n, &pSmaFile->commitID);
+  n += tGetI64v(p + n, &pSmaFile->size);
+
+  return n;
+}
+
+// EXPOSED APIS ==================================================
 void tsdbDataFileName(STsdb *pTsdb, SDFileSet *pDFileSet, EDataFileT ftype, char fname[]) {
   STfs *pTfs = pTsdb->pVnode->pTfs;
 
@@ -49,27 +124,18 @@ int32_t tPutDataFileHdr(uint8_t *p, SDFileSet *pSet, EDataFileT ftype) {
   int32_t n = 0;
 
   switch (ftype) {
-    case TSDB_HEAD_FILE: {
-      SHeadFile *pHeadFile = &pSet->fHead;
-      n += tPutI64(p + n, pHeadFile->commitID);
-      n += tPutI64(p + n, pHeadFile->size);
-      n += tPutI64(p + n, pHeadFile->offset);
-    } break;
-    case TSDB_DATA_FILE: {
-      SDataFile *pDataFile = &pSet->fData;
-      n += tPutI64(p + n, pDataFile->commitID);
-      n += tPutI64(p + n, pDataFile->size);
-    } break;
-    case TSDB_LAST_FILE: {
-      SLastFile *pLastFile = &pSet->fLast;
-      n += tPutI64(p + n, pLastFile->commitID);
-      n += tPutI64(p + n, pLastFile->size);
-    } break;
-    case TSDB_SMA_FILE: {
-      SSmaFile *pSmaFile = &pSet->fSma;
-      n += tPutI64(p + n, pSmaFile->commitID);
-      n += tPutI64(p + n, pSmaFile->size);
-    } break;
+    case TSDB_HEAD_FILE:
+      n += tPutHeadFile(p ? p + n : p, &pSet->fHead);
+      break;
+    case TSDB_DATA_FILE:
+      n += tPutDataFile(p ? p + n : p, &pSet->fData);
+      break;
+    case TSDB_LAST_FILE:
+      n += tPutLastFile(p ? p + n : p, &pSet->fLast);
+      break;
+    case TSDB_SMA_FILE:
+      n += tPutSmaFile(p ? p + n : p, &pSet->fSma);
+      break;
     default:
       ASSERT(0);
   }
@@ -77,13 +143,33 @@ int32_t tPutDataFileHdr(uint8_t *p, SDFileSet *pSet, EDataFileT ftype) {
   return n;
 }
 
-// SHeadFile ===============================================
+int32_t tPutDFileSet(uint8_t *p, SDFileSet *pSet) {
+  int32_t n = 0;
 
-// SDataFile ===============================================
+  n += tPutI32v(p ? p + n : p, pSet->diskId.level);
+  n += tPutI32v(p ? p + n : p, pSet->diskId.id);
+  n += tPutI32v(p ? p + n : p, pSet->fid);
+  n += tPutHeadFile(p ? p + n : p, &pSet->fHead);
+  n += tPutDataFile(p ? p + n : p, &pSet->fData);
+  n += tPutLastFile(p ? p + n : p, &pSet->fLast);
+  n += tPutSmaFile(p ? p + n : p, &pSet->fSma);
 
-// SLastFile ===============================================
+  return n;
+}
 
-// SSmaFile ===============================================
+int32_t tGetDFileSet(uint8_t *p, SDFileSet *pSet) {
+  int32_t n = 0;
+
+  n += tGetI32v(p + n, &pSet->diskId.level);
+  n += tGetI32v(p + n, &pSet->diskId.id);
+  n += tGetI32v(p + n, &pSet->fid);
+  n += tGetHeadFile(p + n, &pSet->fHead);
+  n += tGetDataFile(p + n, &pSet->fData);
+  n += tGetLastFile(p + n, &pSet->fLast);
+  n += tGetSmaFile(p + n, &pSet->fSma);
+
+  return n;
+}
 
 // SDelFile ===============================================
 void tsdbDelFileName(STsdb *pTsdb, SDelFile *pFile, char fname[]) {
@@ -91,4 +177,30 @@ void tsdbDelFileName(STsdb *pTsdb, SDelFile *pFile, char fname[]) {
 
   snprintf(fname, TSDB_FILENAME_LEN - 1, "%s%s%s%sv%dver%" PRId64 "%s", tfsGetPrimaryPath(pTfs), TD_DIRSEP, pTsdb->path,
            TD_DIRSEP, TD_VID(pTsdb->pVnode), pFile->commitID, ".del");
-}
\ No newline at end of file
+}
+
+int32_t tPutDelFile(uint8_t *p, SDelFile *pDelFile) {
+  int32_t n = 0;
+
+  n += tPutI64(p ? p + n : p, pDelFile->minKey);
+  n += tPutI64(p ? p + n : p, pDelFile->maxKey);
+  n += tPutI64v(p ? p + n : p, pDelFile->minVersion);
+  n += tPutI64v(p ? p + n : p, pDelFile->maxVersion);
+  n += tPutI64v(p ? p + n : p, pDelFile->size);
+  n += tPutI64v(p ? p + n : p, pDelFile->offset);
+
+  return n;
+}
+
+int32_t tGetDelFile(uint8_t *p, SDelFile *pDelFile) {
+  int32_t n = 0;
+
+  n += tGetI64(p + n, &pDelFile->minKey);
+  n += tGetI64(p + n, &pDelFile->maxKey);
+  n += tGetI64v(p + n, &pDelFile->minVersion);
+  n += tGetI64v(p + n, &pDelFile->maxVersion);
+  n += tGetI64v(p + n, &pDelFile->size);
+  n += tGetI64v(p + n, &pDelFile->offset);
+
+  return n;
+}
diff --git a/source/dnode/vnode/src/tsdb/tsdbReaderWriter.c b/source/dnode/vnode/src/tsdb/tsdbReaderWriter.c
index cad2404e63..5e3d58199d 100644
--- a/source/dnode/vnode/src/tsdb/tsdbReaderWriter.c
+++ b/source/dnode/vnode/src/tsdb/tsdbReaderWriter.c
@@ -187,7 +187,7 @@ int32_t tsdbUpdateDelFileHdr(SDelFWriter *pWriter, uint8_t **ppBuf) {
 
   // build
   memset(*ppBuf, 0, size);
-  n = tPutDelFileHdr(*ppBuf, pWriter->pFile);
+  n = tPutDelFile(*ppBuf, pWriter->pFile);
   taosCalcChecksumAppend(0, *ppBuf, size);
 
   ASSERT(n <= size - sizeof(TSCKSUM));
diff --git a/source/dnode/vnode/src/tsdb/tsdbUtil.c b/source/dnode/vnode/src/tsdb/tsdbUtil.c
index 73b7864157..b6065a82bd 100644
--- a/source/dnode/vnode/src/tsdb/tsdbUtil.c
+++ b/source/dnode/vnode/src/tsdb/tsdbUtil.c
@@ -518,32 +518,6 @@ int32_t tGetDelData(uint8_t *p, void *ph) {
   return n;
 }
 
-int32_t tPutDelFileHdr(uint8_t *p, SDelFile *pDelFile) {
-  int32_t n = 0;
-
-  n += tPutI64(p ? p + n : p, pDelFile->minKey);
-  n += tPutI64(p ? p + n : p, pDelFile->maxKey);
-  n += tPutI64v(p ? p + n : p, pDelFile->minVersion);
-  n += tPutI64v(p ? p + n : p, pDelFile->maxVersion);
-  n += tPutI64v(p ? p + n : p, pDelFile->size);
-  n += tPutI64v(p ? p + n : p, pDelFile->offset);
-
-  return n;
-}
-
-int32_t tGetDelFileHdr(uint8_t *p, SDelFile *pDelFile) {
-  int32_t n = 0;
-
-  n += tGetI64(p + n, &pDelFile->minKey);
-  n += tGetI64(p + n, &pDelFile->maxKey);
-  n += tGetI64v(p + n, &pDelFile->minVersion);
-  n += tGetI64v(p + n, &pDelFile->maxVersion);
-  n += tGetI64v(p + n, &pDelFile->size);
-  n += tGetI64v(p + n, &pDelFile->offset);
-
-  return n;
-}
-
 int32_t tsdbKeyFid(TSKEY key, int32_t minutes, int8_t precision) {
   if (key < 0) {
     return (int)((key + 1) / tsTickPerMin[precision] / minutes - 1);