fix: upgrade bug

source/dnode/vnode/src/tsdb/tsdbFSet2.c

@@ -23,10 +23,13 @@ int32_t tsdbSttLvlInit(int32_t level, SSttLvl **lvl) {
 }
 
 static void tsdbSttLvlClearFObj(void *data) { tsdbTFileObjUnref(*(STFileObj **)data); }
-static int32_t tsdbSttLvlClear(SSttLvl **lvl) {
+
+int32_t tsdbSttLvlClear(SSttLvl **lvl) {
+  if (lvl[0] != NULL) {
     TARRAY2_DESTROY(lvl[0]->fobjArr, tsdbSttLvlClearFObj);
     taosMemoryFree(lvl[0]);
     lvl[0] = NULL;
+  }
   return 0;
 }
 

source/dnode/vnode/src/tsdb/tsdbUpgrade.c

@@ -27,6 +27,7 @@ extern int32_t tsdbFileWriteBrinBlock(STsdbFD *fd, SBrinBlock *brinBlock, int8_t
 extern int32_t tsdbFileWriteBrinBlk(STsdbFD *fd, TBrinBlkArray *brinBlkArray, SFDataPtr *ptr, int64_t *fileSize);
 extern int32_t tsdbFileWriteHeadFooter(STsdbFD *fd, int64_t *fileSize, const SHeadFooter *footer);
 extern int32_t tsdbSttLvlInit(int32_t level, SSttLvl **lvl);
+extern int32_t tsdbSttLvlClear(SSttLvl **lvl);
 extern int32_t tsdbFileWriteSttBlk(STsdbFD *fd, const TSttBlkArray *sttBlkArray, SFDataPtr *ptr, int64_t *fileSize);
 extern int32_t tsdbFileWriteSttFooter(STsdbFD *fd, const SSttFooter *footer, int64_t *fileSize);
 extern int32_t tsdbFileWriteTombBlock(STsdbFD *fd, STombBlock *tombBlock, int8_t cmprAlg, int64_t *fileSize,
@@ -38,6 +39,7 @@ static int32_t tsdbUpgradeHead(STsdb *tsdb, SDFileSet *pDFileSet, SDataFReader *
   int32_t code = 0;
   int32_t lino = 0;
 
+  // init
   struct {
     // config
     int32_t  maxRow;
@@ -59,6 +61,7 @@ static int32_t tsdbUpgradeHead(STsdb *tsdb, SDFileSet *pDFileSet, SDataFReader *
       .szPage = tsdb->pVnode->config.tsdbPageSize,
   }};
 
+  // read SBlockIdx array
   if ((ctx->aBlockIdx = taosArrayInit(0, sizeof(SBlockIdx))) == NULL) {
     code = TSDB_CODE_OUT_OF_MEMORY;
     TSDB_CHECK_CODE(code, lino, _exit);
@@ -67,9 +70,8 @@ static int32_t tsdbUpgradeHead(STsdb *tsdb, SDFileSet *pDFileSet, SDataFReader *
   code = tsdbReadBlockIdx(reader, ctx->aBlockIdx);
   TSDB_CHECK_CODE(code, lino, _exit);
 
-  if (taosArrayGetSize(ctx->aBlockIdx) == 0) {
-    goto _exit;
-  } else {
+  if (taosArrayGetSize(ctx->aBlockIdx) > 0) {
+    // init/open file fd
     STFile file = {
         .type = TSDB_FTYPE_HEAD,
         .did = pDFileSet->diskId,
@@ -87,8 +89,8 @@ static int32_t tsdbUpgradeHead(STsdb *tsdb, SDFileSet *pDFileSet, SDataFReader *
 
     code = tsdbOpenFile(fname, ctx->szPage, TD_FILE_READ | TD_FILE_WRITE, &ctx->fd);
     TSDB_CHECK_CODE(code, lino, _exit);
-  }
 
+    // convert
     for (int32_t iBlockIdx = 0; iBlockIdx < taosArrayGetSize(ctx->aBlockIdx); ++iBlockIdx) {
       SBlockIdx *pBlockIdx = taosArrayGet(ctx->aBlockIdx, iBlockIdx);
 
@@ -146,8 +148,8 @@ static int32_t tsdbUpgradeHead(STsdb *tsdb, SDFileSet *pDFileSet, SDataFReader *
       TSDB_CHECK_CODE(code, lino, _exit);
     }
 
-  code =
-      tsdbFileWriteBrinBlk(ctx->fd, ctx->brinBlkArray, ctx->footer->brinBlkPtr, &fset->farr[TSDB_FTYPE_HEAD]->f->size);
+    code = tsdbFileWriteBrinBlk(ctx->fd, ctx->brinBlkArray, ctx->footer->brinBlkPtr,
+                                &fset->farr[TSDB_FTYPE_HEAD]->f->size);
     TSDB_CHECK_CODE(code, lino, _exit);
 
     code = tsdbFileWriteHeadFooter(ctx->fd, &fset->farr[TSDB_FTYPE_HEAD]->f->size, ctx->footer);
@@ -157,6 +159,7 @@ static int32_t tsdbUpgradeHead(STsdb *tsdb, SDFileSet *pDFileSet, SDataFReader *
     TSDB_CHECK_CODE(code, lino, _exit);
 
     tsdbCloseFile(&ctx->fd);
+  }
 
 _exit:
   if (code) {
@@ -313,8 +316,12 @@ static int32_t tsdbUpgradeStt(STsdb *tsdb, SDFileSet *pDFileSet, SDataFReader *r
     TSDB_CHECK_CODE(code, lino, _exit);
   }
 
+  if (TARRAY2_SIZE(lvl->fobjArr) > 0) {
     code = TARRAY2_APPEND(fset->lvlArr, lvl);
     TSDB_CHECK_CODE(code, lino, _exit);
+  } else {
+    tsdbSttLvlClear(&lvl);
+  }
 
 _exit:
   if (code) {