diff --git a/source/dnode/vnode/src/tsdb/tsdbFS.c b/source/dnode/vnode/src/tsdb/tsdbFS.c
index 74f1aef1fc..247de99338 100644
--- a/source/dnode/vnode/src/tsdb/tsdbFS.c
+++ b/source/dnode/vnode/src/tsdb/tsdbFS.c
@@ -576,10 +576,7 @@ int32_t tsdbFSCopy(STsdb *pTsdb, STsdbFS *pFS) {
       code = TSDB_CODE_OUT_OF_MEMORY;
       goto _exit;
     }
-    fSet.pHeadF->nRef = 0;
-    fSet.pHeadF->commitID = pSet->pHeadF->commitID;
-    fSet.pHeadF->size = pSet->pHeadF->size;
-    fSet.pHeadF->offset = pSet->pHeadF->offset;
+    *fSet.pHeadF = *pSet->pHeadF;
 
     // data
     fSet.pDataF = (SDataFile *)taosMemoryMalloc(sizeof(SDataFile));
@@ -587,9 +584,7 @@ int32_t tsdbFSCopy(STsdb *pTsdb, STsdbFS *pFS) {
       code = TSDB_CODE_OUT_OF_MEMORY;
       goto _exit;
     }
-    fSet.pDataF->nRef = 0;
-    fSet.pDataF->commitID = pSet->pDataF->commitID;
-    fSet.pDataF->size = pSet->pDataF->size;
+    *fSet.pDataF = *pSet->pDataF;
 
     // data
     fSet.pLastF = (SLastFile *)taosMemoryMalloc(sizeof(SLastFile));
@@ -597,9 +592,7 @@ int32_t tsdbFSCopy(STsdb *pTsdb, STsdbFS *pFS) {
       code = TSDB_CODE_OUT_OF_MEMORY;
       goto _exit;
     }
-    fSet.pLastF->nRef = 0;
-    fSet.pLastF->commitID = pSet->pLastF->commitID;
-    fSet.pLastF->size = pSet->pLastF->size;
+    *fSet.pLastF = *pSet->pLastF;
 
     // last
     fSet.pSmaF = (SSmaFile *)taosMemoryMalloc(sizeof(SSmaFile));
@@ -607,9 +600,7 @@ int32_t tsdbFSCopy(STsdb *pTsdb, STsdbFS *pFS) {
       code = TSDB_CODE_OUT_OF_MEMORY;
       goto _exit;
     }
-    fSet.pSmaF->nRef = 0;
-    fSet.pSmaF->commitID = pSet->pSmaF->commitID;
-    fSet.pSmaF->size = pSet->pSmaF->size;
+    *fSet.pSmaF = *pSet->pSmaF;
 
     if (taosArrayPush(pFS->aDFileSet, &fSet) == NULL) {
       code = TSDB_CODE_OUT_OF_MEMORY;
diff --git a/source/dnode/vnode/src/tsdb/tsdbReaderWriter.c b/source/dnode/vnode/src/tsdb/tsdbReaderWriter.c
index af1342daf3..06aa5ef3cb 100644
--- a/source/dnode/vnode/src/tsdb/tsdbReaderWriter.c
+++ b/source/dnode/vnode/src/tsdb/tsdbReaderWriter.c
@@ -63,6 +63,7 @@ _err:
 int32_t tsdbDelFWriterClose(SDelFWriter **ppWriter, int8_t sync) {
   int32_t      code = 0;
   SDelFWriter *pWriter = *ppWriter;
+  STsdb       *pTsdb = pWriter->pTsdb;
 
   // sync
   if (sync && taosFsyncFile(pWriter->pWriteH) < 0) {
@@ -83,7 +84,7 @@ int32_t tsdbDelFWriterClose(SDelFWriter **ppWriter, int8_t sync) {
   return code;
 
 _err:
-  tsdbError("vgId:%d, failed to close del file writer since %s", TD_VID(pWriter->pTsdb->pVnode), tstrerror(code));
+  tsdbError("vgId:%d, failed to close del file writer since %s", TD_VID(pTsdb->pVnode), tstrerror(code));
   return code;
 }
 
@@ -1053,7 +1054,9 @@ int32_t tsdbDataFWriterClose(SDataFWriter **ppWriter, int8_t sync) {
   STsdb  *pTsdb = NULL;
 
   if (*ppWriter == NULL) goto _exit;
-  pTsdb = (*ppWriter)->pTsdb if (sync) {
+
+  pTsdb = (*ppWriter)->pTsdb;
+  if (sync) {
     if (taosFsyncFile((*ppWriter)->pHeadFD) < 0) {
       code = TAOS_SYSTEM_ERROR(errno);
       goto _err;