load SBlockData

src/tsdb/src/tsdbReadImpl.c

@@ -300,7 +300,7 @@ int tsdbLoadBlockDataCols(SReadH *pReadh, SBlock *pBlock, SBlockInfo *pBlkInfo,
 
 int tsdbLoadBlockStatis(SReadH *pReadh, SBlock *pBlock) {
   ASSERT(pBlock->numOfSubBlocks <= 1);
-  if (!tsdbQueryFromSMA) {
+
     SDFile *pDFile = (pBlock->last) ? TSDB_READ_LAST_FILE(pReadh) : TSDB_READ_DATA_FILE(pReadh);
 
     if (tsdbSeekDFile(pDFile, pBlock->offset, SEEK_SET) < 0) {
@@ -335,8 +335,9 @@ int tsdbLoadBlockStatis(SReadH *pReadh, SBlock *pBlock) {
                 TSDB_READ_REPO_ID(pReadh), TSDB_FILE_FULL_NAME(pDFile), (int64_t)pBlock->offset, size);
       return -1;
     }
-  } else {
+
 #ifdef __TD_6117__
+    if (tsdbQueryFromSMA) {
       SDFile *pDFileAggr = TSDB_READ_AGGR_FILE(pReadh);
 
       if (tsdbSeekDFile(pDFileAggr, pBlock->aggrOffset, SEEK_SET) < 0) {
@@ -351,7 +352,8 @@ int tsdbLoadBlockStatis(SReadH *pReadh, SBlock *pBlock) {
 
       int64_t nreadAggr = tsdbReadDFile(pDFileAggr, (void *)(pReadh->pAggrBlkData), sizeAggr);
       if (nreadAggr < 0) {
-      tsdbError("vgId:%d failed to load block statis part while read file %s since %s, offset:%" PRId64 " len :%" PRIzu,
+        tsdbError("vgId:%d failed to load block statis part while read file %s since %s, offset:%" PRId64
+                  " len :%" PRIzu,
                   TSDB_READ_REPO_ID(pReadh), TSDB_FILE_FULL_NAME(pDFileAggr), tstrerror(terrno),
                   (int64_t)pBlock->aggrOffset, sizeAggr);
         return -1;
@@ -373,10 +375,11 @@ int tsdbLoadBlockStatis(SReadH *pReadh, SBlock *pBlock) {
                   TSDB_READ_REPO_ID(pReadh), TSDB_FILE_FULL_NAME(pDFileAggr), (int64_t)pBlock->aggrOffset, sizeAggr);
         return -1;
       }
-#endif
     }
 
-  return 0;
+#endif
+
+return 0;
 }
 
 int tsdbEncodeSBlockIdx(void **buf, SBlockIdx *pIdx) {