From 56f1afb19c4c3a031dcc44264e4ae8195e0fbbe6 Mon Sep 17 00:00:00 2001
From: Minglei Jin <mljin@taosdata.com>
Date: Thu, 16 Feb 2023 09:28:35 +0800
Subject: [PATCH] fix(tsdb/cache): use block index cache with last/last_row

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

diff --git a/source/dnode/vnode/src/tsdb/tsdbCache.c b/source/dnode/vnode/src/tsdb/tsdbCache.c
index ec0944193a..43c55d103b 100644
--- a/source/dnode/vnode/src/tsdb/tsdbCache.c
+++ b/source/dnode/vnode/src/tsdb/tsdbCache.c
@@ -17,7 +17,7 @@
 
 static int32_t tsdbOpenBICache(STsdb *pTsdb) {
   int32_t    code = 0;
-  SLRUCache *pCache = taosLRUCacheInit(5 * 1024 * 1024, -1, .5);
+  SLRUCache *pCache = taosLRUCacheInit(10 * 1024 * 1024, 1, .5);
   if (pCache == NULL) {
     code = TSDB_CODE_OUT_OF_MEMORY;
     goto _err;
@@ -48,7 +48,7 @@ int32_t tsdbOpenCache(STsdb *pTsdb) {
   SLRUCache *pCache = NULL;
   size_t     cfgCapacity = pTsdb->pVnode->config.cacheLastSize * 1024 * 1024;
 
-  pCache = taosLRUCacheInit(cfgCapacity, -1, .5);
+  pCache = taosLRUCacheInit(cfgCapacity, 1, .5);
   if (pCache == NULL) {
     code = TSDB_CODE_OUT_OF_MEMORY;
     goto _err;
@@ -644,6 +644,7 @@ typedef struct SFSNextRowIter {
   SArray            *aDFileSet;
   SDataFReader     **pDataFReader;
   SArray            *aBlockIdx;
+  LRUHandle         *aBlockIdxHandle;
   SBlockIdx         *pBlockIdx;
   SMapData           blockMap;
   int32_t            nBlock;
@@ -697,6 +698,7 @@ static int32_t getNextRowFromFS(void *iter, TSDBROW **ppRow) {
       }
 
       // tMapDataReset(&state->blockIdxMap);
+      /*
       if (!state->aBlockIdx) {
         state->aBlockIdx = taosArrayInit(0, sizeof(SBlockIdx));
       } else {
@@ -704,6 +706,13 @@ 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);
+      if (code != TSDB_CODE_SUCCESS || state->aBlockIdxHandle == NULL) {
+        goto _err;
+      }
+      state->aBlockIdx = (SArray *)taosLRUCacheValue((*state->pDataFReader)->pTsdb->biCache, state->aBlockIdxHandle);
 
       /* if (state->pBlockIdx) { */
       /* } */
@@ -772,7 +781,10 @@ static int32_t getNextRowFromFS(void *iter, TSDBROW **ppRow) {
             // resetLastBlockLoadInfo(state->pLoadInfo);
 
             if (state->aBlockIdx) {
-              taosArrayDestroy(state->aBlockIdx);
+              // taosArrayDestroy(state->aBlockIdx);
+              tsdbBICacheRelease((*state->pDataFReader)->pTsdb->biCache, state->aBlockIdxHandle);
+
+              state->aBlockIdxHandle = NULL;
               state->aBlockIdx = NULL;
             }
 
@@ -795,7 +807,10 @@ _err:
     resetLastBlockLoadInfo(state->pLoadInfo);
     }*/
   if (state->aBlockIdx) {
-    taosArrayDestroy(state->aBlockIdx);
+    // taosArrayDestroy(state->aBlockIdx);
+    tsdbBICacheRelease((*state->pDataFReader)->pTsdb->biCache, state->aBlockIdxHandle);
+
+    state->aBlockIdxHandle = NULL;
     state->aBlockIdx = NULL;
   }
   if (state->pBlockData) {
@@ -821,7 +836,10 @@ int32_t clearNextRowFromFS(void *iter) {
     state->pDataFReader = NULL;
     }*/
   if (state->aBlockIdx) {
-    taosArrayDestroy(state->aBlockIdx);
+    // taosArrayDestroy(state->aBlockIdx);
+    tsdbBICacheRelease((*state->pDataFReader)->pTsdb->biCache, state->aBlockIdxHandle);
+
+    state->aBlockIdxHandle = NULL;
     state->aBlockIdx = NULL;
   }
   if (state->pBlockData) {
-- 
GitLab