From 724e7bc3a11142854fabb29b6b2eb9ab482f9983 Mon Sep 17 00:00:00 2001
From: Minglei Jin <mljin@taosdata.com>
Date: Tue, 21 Feb 2023 18:23:18 +0800
Subject: [PATCH] fix(tsdb/cache): use state's tsdb instead of readers

---
 source/dnode/vnode/src/tsdb/tsdbCache.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/source/dnode/vnode/src/tsdb/tsdbCache.c b/source/dnode/vnode/src/tsdb/tsdbCache.c
index 7f3c142f37..c05206785b 100644
--- a/source/dnode/vnode/src/tsdb/tsdbCache.c
+++ b/source/dnode/vnode/src/tsdb/tsdbCache.c
@@ -779,12 +779,11 @@ static int32_t getNextRowFromFS(void *iter, TSDBROW **ppRow) {
       code = tsdbReadBlockIdx(*state->pDataFReader, state->aBlockIdx);
       if (code) goto _err;
       */
-      int32_t code =
-          tsdbCacheGetBlockIdx((*state->pDataFReader)->pTsdb->biCache, *state->pDataFReader, &state->aBlockIdxHandle);
+      int32_t code = tsdbCacheGetBlockIdx(state->pTsdb->biCache, *state->pDataFReader, &state->aBlockIdxHandle);
       if (code != TSDB_CODE_SUCCESS || state->aBlockIdxHandle == NULL) {
         goto _err;
       }
-      state->aBlockIdx = (SArray *)taosLRUCacheValue((*state->pDataFReader)->pTsdb->biCache, state->aBlockIdxHandle);
+      state->aBlockIdx = (SArray *)taosLRUCacheValue(state->pTsdb->biCache, state->aBlockIdxHandle);
 
       /* if (state->pBlockIdx) { */
       /* } */
@@ -855,7 +854,7 @@ static int32_t getNextRowFromFS(void *iter, TSDBROW **ppRow) {
 
             if (state->aBlockIdx) {
               // taosArrayDestroy(state->aBlockIdx);
-              tsdbBICacheRelease((*state->pDataFReader)->pTsdb->biCache, state->aBlockIdxHandle);
+              tsdbBICacheRelease(state->pTsdb->biCache, state->aBlockIdxHandle);
 
               state->aBlockIdxHandle = NULL;
               state->aBlockIdx = NULL;
@@ -881,7 +880,7 @@ _err:
     }*/
   if (state->aBlockIdx) {
     // taosArrayDestroy(state->aBlockIdx);
-    tsdbBICacheRelease((*state->pDataFReader)->pTsdb->biCache, state->aBlockIdxHandle);
+    tsdbBICacheRelease(state->pTsdb->biCache, state->aBlockIdxHandle);
 
     state->aBlockIdxHandle = NULL;
     state->aBlockIdx = NULL;
@@ -910,7 +909,7 @@ int32_t clearNextRowFromFS(void *iter) {
     }*/
   if (state->aBlockIdx) {
     // taosArrayDestroy(state->aBlockIdx);
-    tsdbBICacheRelease((*state->pDataFReader)->pTsdb->biCache, state->aBlockIdxHandle);
+    tsdbBICacheRelease(state->pTsdb->biCache, state->aBlockIdxHandle);
 
     state->aBlockIdxHandle = NULL;
     state->aBlockIdx = NULL;