diff --git a/source/dnode/vnode/src/tsdb/tsdbRead2.c b/source/dnode/vnode/src/tsdb/tsdbRead2.c
index 441d073666..527486270c 100644
--- a/source/dnode/vnode/src/tsdb/tsdbRead2.c
+++ b/source/dnode/vnode/src/tsdb/tsdbRead2.c
@@ -4812,7 +4812,7 @@ static int32_t checkForNeighborFileBlock(STsdbReader* pReader, STableBlockScanIn
   pBlockData = &pReader->status.fileBlockData;
   asc = ASCENDING_TRAVERSE(pReader->info.order);
   pVerRange = &pReader->info.verRange;
-  ASCENDING_TRAVERSE(pReader->info.order) ? 1 : -1;
+  step = ASCENDING_TRAVERSE(pReader->info.order) ? 1 : -1;
 
   *state = CHECK_FILEBLOCK_QUIT;
   code = loadNeighborIfOverlap(pFBlock, pScanInfo, pReader, &loadNeighbor);
@@ -6169,7 +6169,7 @@ int32_t tsdbNextDataBlock2(STsdbReader* pReader, bool* hasNext) {
         TSDB_CHECK_CODE(code, lino, _end);
       }
 
-      goto _end;
+      return code;
     }
   }
 
diff --git a/tests/system-test/2-query/partition_by_col.py b/tests/system-test/2-query/partition_by_col.py
index ef88e88cbd..da7fe78124 100644
--- a/tests/system-test/2-query/partition_by_col.py
+++ b/tests/system-test/2-query/partition_by_col.py
@@ -313,7 +313,21 @@ class TDTestCase:
         order_by_list = 'ts,c1,c2,c3,c4,c5,c6,c7,c8,c9,t1,t2,t3,t4,t5,t6'
 
         self.prepare_and_query_and_compare(sqls, order_by_list, compare_what=COMPARE_LEN)
+    
+    def test_tsdb_read(self):
+        tdSql.execute('delete from t0')
+        tdSql.execute('flush database test')
+        for i in range(0, 4096):
+            tdSql.execute(f"insert into test.t0 values({1537146000000 + i}, 1,1,1,1,1,1,1,'a','1')")
+        tdSql.execute("flush database test")
 
+        tdSql.execute(f"insert into t0 values({1537146000000 + 4095}, 1,1,1,1,1,1,1,'a','1')")
+        for i in range(4095, 4096*2 + 100):
+            tdSql.execute(f"insert into test.t0 values({1537146000000 + i}, 1,1,1,1,1,1,1,'a','1')")
+        tdSql.execute("flush database test")
+        time.sleep(5)
+        tdSql.query('select first(ts), last(ts) from t0', queryTimes=1)
+        tdSql.checkRows(1)
 
     def run(self):
         self.prepareTestEnv()
@@ -323,6 +337,8 @@ class TDTestCase:
         self.test_sort_for_partition_res()
         self.test_sort_for_partition_interval()
         self.test_sort_for_partition_no_agg_limit()
+        self.test_tsdb_read()
+
 
     def stop(self):
         tdSql.close()