fix more

source/dnode/vnode/src/inc/tsdb.h

@@ -202,7 +202,7 @@ int32_t tMapDataToArray(SMapData *pMapData, int32_t itemSize, int32_t (*tGetItem
 // other
 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 tsdbFidLevel(int32_t fid, STsdbKeepCfg *pKeepCfg, int64_t now);
+int32_t tsdbFidLevel(int32_t fid, STsdbKeepCfg *pKeepCfg, int64_t nowSec);
 int32_t tsdbBuildDeleteSkyline(SArray *aDelData, int32_t sidx, int32_t eidx, SArray *aSkyline);
 int32_t tPutColumnDataAgg(uint8_t *p, SColumnDataAgg *pColAgg);
 int32_t tGetColumnDataAgg(uint8_t *p, SColumnDataAgg *pColAgg);
@@ -707,7 +707,7 @@ typedef struct SSttBlockLoadInfo {
 
   SArray   *aSttBlk;
   SArray   *pTombBlockArray;  // tomb block array list
-  int32_t   blockIndex[2];  // to denote the loaded block in the corresponding position.
+  int32_t   blockIndex[2];    // to denote the loaded block in the corresponding position.
   int32_t   currentLoadBlockIndex;
   int32_t   loadBlocks;
   double    elapsedTime;

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

@@ -629,6 +629,12 @@ static int32_t tsdbIterSkipTableData(STsdbIter *iter, const TABLEID *tbid) {
       return tsdbDataIterNext(iter, tbid);
     case TSDB_ITER_TYPE_MEMT:
       return tsdbMemTableIterNext(iter, tbid);
+    case TSDB_ITER_TYPE_STT_TOMB:
+      return tsdbSttTombIterNext(iter, tbid);
+    case TSDB_ITER_TYPE_DATA_TOMB:
+      return tsdbDataTombIterNext(iter, tbid);
+    case TSDB_ITER_TYPE_MEMT_TOMB:
+      return tsdbMemTombIterNext(iter, tbid);
     default:
       ASSERT(false);
   }

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

@@ -52,7 +52,7 @@ typedef struct {
 } SMerger;
 
 static int32_t tsdbMergerOpen(SMerger *merger) {
-  merger->ctx->now = taosGetTimestampMs();
+  merger->ctx->now = taosGetTimestampSec();
   merger->maxRow = merger->tsdb->pVnode->config.tsdbCfg.maxRows;
   merger->minRow = merger->tsdb->pVnode->config.tsdbCfg.minRows;
   merger->szPage = merger->tsdb->pVnode->config.tsdbPageSize;

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

@@ -766,7 +766,7 @@ static int32_t tsdbSnapWriteFileSetBegin(STsdbSnapWriter* writer, int32_t fid) {
   writer->ctx->fid = fid;
   writer->ctx->fset = TARRAY2_SEARCH_EX(writer->fsetArr, &fset, tsdbTFileSetCmprFn, TD_EQ);
 
-  int32_t level = tsdbFidLevel(fid, &writer->tsdb->keepCfg, writer->now);
+  int32_t level = tsdbFidLevel(fid, &writer->tsdb->keepCfg, taosGetTimestampSec());
   if (tfsAllocDisk(writer->tsdb->pVnode->pTfs, level, &writer->ctx->did)) {
     code = TSDB_CODE_NO_AVAIL_DISK;
     TSDB_CHECK_CODE(code, lino, _exit);