diff --git a/source/dnode/vnode/src/meta/metaOpen.c b/source/dnode/vnode/src/meta/metaOpen.c
index 8055d6e139..4a3dcd0e51 100644
--- a/source/dnode/vnode/src/meta/metaOpen.c
+++ b/source/dnode/vnode/src/meta/metaOpen.c
@@ -246,32 +246,20 @@ int metaAlterCache(SMeta *pMeta, int32_t nPage) {
 }
 
 int32_t metaRLock(SMeta *pMeta) {
-  int32_t ret = 0;
-
   metaTrace("meta rlock %p", &pMeta->lock);
-
-  ret = taosThreadRwlockRdlock(&pMeta->lock);
-
+  int32_t ret = taosThreadRwlockRdlock(&pMeta->lock);
   return ret;
 }
 
 int32_t metaWLock(SMeta *pMeta) {
-  int32_t ret = 0;
-
   metaTrace("meta wlock %p", &pMeta->lock);
-
-  ret = taosThreadRwlockWrlock(&pMeta->lock);
-
+  int32_t ret = taosThreadRwlockWrlock(&pMeta->lock);
   return ret;
 }
 
 int32_t metaULock(SMeta *pMeta) {
-  int32_t ret = 0;
-
   metaTrace("meta ulock %p", &pMeta->lock);
-
-  ret = taosThreadRwlockUnlock(&pMeta->lock);
-
+  int32_t ret = taosThreadRwlockUnlock(&pMeta->lock);
   return ret;
 }
 
diff --git a/source/dnode/vnode/src/tsdb/tsdbMergeTree.c b/source/dnode/vnode/src/tsdb/tsdbMergeTree.c
index 0b86cae1be..ba0c5697c0 100644
--- a/source/dnode/vnode/src/tsdb/tsdbMergeTree.c
+++ b/source/dnode/vnode/src/tsdb/tsdbMergeTree.c
@@ -429,7 +429,7 @@ static int32_t doLoadSttFilesBlk(SSttBlockLoadInfo *pBlockLoadInfo, SLDataIter *
   code = loadTombFn(pReader1, pIter->pReader, pIter->pBlockLoadInfo);
 
   double el = (taosGetTimestampUs() - st) / 1000.0;
-  tsdbDebug("load the stt file info completed, elapsed time:%.2fms, %s", el, idStr);
+  tsdbDebug("load the stt file blk info completed, elapsed time:%.2fms, %s", el, idStr);
   return code;
 }
 
@@ -806,7 +806,7 @@ int32_t tMergeTreeOpen2(SMergeTree *pMTree, SMergeTreeConf *pConf, SSttDataInfoF
         tMergeTreeAddIter(pMTree, pIter);
 
         // let's record the time window for current table of uid in the stt files
-        if (pSttDataInfo != NULL) {
+        if (pSttDataInfo != NULL && numOfRows > 0) {
           taosArrayPush(pSttDataInfo->pTimeWindowList, &w);
           pSttDataInfo->numOfRows += numOfRows;
         }
diff --git a/source/dnode/vnode/src/tsdb/tsdbRead2.c b/source/dnode/vnode/src/tsdb/tsdbRead2.c
index c0ad32d269..69f4f82459 100644
--- a/source/dnode/vnode/src/tsdb/tsdbRead2.c
+++ b/source/dnode/vnode/src/tsdb/tsdbRead2.c
@@ -2093,7 +2093,7 @@ static bool initSttBlockReader(SSttBlockReader* pSttBlockReader, STableBlockScan
       pScanInfo->sttKeyInfo.status = taosArrayGetSize(info.pTimeWindowList) ? STT_FILE_HAS_DATA : STT_FILE_NO_DATA;
       pScanInfo->sttKeyInfo.nextProcKey =
           ASCENDING_TRAVERSE(pReader->info.order) ? pScanInfo->sttWindow.skey : pScanInfo->sttWindow.ekey;
-      hasData = true;
+      hasData = (pScanInfo->sttKeyInfo.status == STT_FILE_HAS_DATA);
     } else {  // not clean stt blocks
       INIT_TIMEWINDOW(&pScanInfo->sttWindow);  //reset the time window
       pScanInfo->sttBlockReturned = false;
diff --git a/source/libs/stream/src/streamMeta.c b/source/libs/stream/src/streamMeta.c
index a072ee1f6f..5f6440c06d 100644
--- a/source/libs/stream/src/streamMeta.c
+++ b/source/libs/stream/src/streamMeta.c
@@ -1128,7 +1128,11 @@ static int32_t metaHeartbeatToMnodeImpl(SStreamMeta* pMeta) {
     }
 
     if ((*pTask)->exec.pWalReader != NULL) {
-      entry.processedVer = (*pTask)->chkInfo.nextProcessVer - 1;
+      entry.processedVer = walReaderGetCurrentVer((*pTask)->exec.pWalReader) - 1;
+      if (entry.processedVer < 0) {
+        entry.processedVer = (*pTask)->chkInfo.processedVer;
+      }
+
       walReaderValidVersionRange((*pTask)->exec.pWalReader, &entry.verStart, &entry.verEnd);
     }