From a9e64f29380062871c6c6dbfd4e52d56c8b1be19 Mon Sep 17 00:00:00 2001
From: yihaoDeng <luomoxyz@126.com>
Date: Thu, 14 Jul 2022 15:17:05 +0800
Subject: [PATCH] feat: add lru to index

---
 include/libs/index/index.h                   |   4 +++-
 source/dnode/vnode/src/meta/metaOpen.c       |   4 ++--
 source/dnode/vnode/src/tsdb/.tsdbCache.c.swo | Bin 0 -> 16384 bytes
 source/libs/index/inc/indexInt.h             |   7 +------
 source/libs/index/src/index.c                |   4 +---
 source/libs/index/test/indexTests.cc         |  13 +++++--------
 6 files changed, 12 insertions(+), 20 deletions(-)
 create mode 100644 source/dnode/vnode/src/tsdb/.tsdbCache.c.swo

diff --git a/include/libs/index/index.h b/include/libs/index/index.h
index 08d64699d4..c1fdc4df52 100644
--- a/include/libs/index/index.h
+++ b/include/libs/index/index.h
@@ -28,7 +28,6 @@ extern "C" {
 
 typedef struct SIndex               SIndex;
 typedef struct SIndexTerm           SIndexTerm;
-typedef struct SIndexOpts           SIndexOpts;
 typedef struct SIndexMultiTermQuery SIndexMultiTermQuery;
 typedef struct SArray               SIndexMultiTerm;
 
@@ -62,6 +61,9 @@ typedef enum {
   QUERY_MAX
 } EIndexQueryType;
 
+typedef struct SIndexOpts {
+  int32_t cacheSize;  // MB
+} SIndexOpts;
 /*
  * create multi query
  * @param oper (input, relation between querys)
diff --git a/source/dnode/vnode/src/meta/metaOpen.c b/source/dnode/vnode/src/meta/metaOpen.c
index 0a27f0bc4e..59df35d554 100644
--- a/source/dnode/vnode/src/meta/metaOpen.c
+++ b/source/dnode/vnode/src/meta/metaOpen.c
@@ -103,8 +103,8 @@ int metaOpen(SVnode *pVnode, SMeta **ppMeta) {
   sprintf(indexFullPath, "%s/%s", pMeta->path, "invert");
   taosMkDir(indexFullPath);
 
-  SIndexOpts *opts = indexOptsCreate(8 * 1024 * 1024);
-  ret = indexOpen(opts, indexFullPath, (SIndex **)&pMeta->pTagIvtIdx);
+  SIndexOpts opts = {.cacheSize = 8 * 1024 * 1024};
+  ret = indexOpen(&opts, indexFullPath, (SIndex **)&pMeta->pTagIvtIdx);
   if (ret < 0) {
     metaError("vgId:%d, failed to open meta tag index since %s", TD_VID(pVnode), tstrerror(terrno));
     goto _err;
diff --git a/source/dnode/vnode/src/tsdb/.tsdbCache.c.swo b/source/dnode/vnode/src/tsdb/.tsdbCache.c.swo
new file mode 100644
index 0000000000000000000000000000000000000000..9feb547e0573668075490648079b7daa25b63e0c
GIT binary patch
literal 16384
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
V8lp}r0VCQ7_(f)>T1MBb^>4m-J}dwL

literal 0
HcmV?d00001

diff --git a/source/libs/index/inc/indexInt.h b/source/libs/index/inc/indexInt.h
index 9370f7c708..065f4acb57 100644
--- a/source/libs/index/inc/indexInt.h
+++ b/source/libs/index/inc/indexInt.h
@@ -68,12 +68,7 @@ struct SIndex {
   TdThreadMutex mtx;
   tsem_t        sem;
   bool          quit;
-  void*         opts;
-};
-
-struct SIndexOpts {
-  int32_t cacheSize;  // MB
-  int32_t cacheOpt;   // MB
+  SIndexOpts    opts;
 };
 
 struct SIndexMultiTermQuery {
diff --git a/source/libs/index/src/index.c b/source/libs/index/src/index.c
index c710858b82..283d59df4b 100644
--- a/source/libs/index/src/index.c
+++ b/source/libs/index/src/index.c
@@ -128,7 +128,7 @@ int indexOpen(SIndexOpts* opts, const char* path, SIndex** index) {
   tsem_init(&idx->sem, 0, 0);
 
   idx->refId = idxAddRef(idx);
-  idx->opts = opts;
+  idx->opts = *opts;
   idxAcquireRef(idx->refId);
 
   *index = idx;
@@ -155,8 +155,6 @@ void indexDestroy(void* handle) {
     taosLRUCacheCleanup(lru);
   }
   idx->lru = NULL;
-
-  indexOptsDestroy(idx->opts);
   taosMemoryFree(idx);
   return;
 }
diff --git a/source/libs/index/test/indexTests.cc b/source/libs/index/test/indexTests.cc
index 42127242b6..3c1f148ae4 100644
--- a/source/libs/index/test/indexTests.cc
+++ b/source/libs/index/test/indexTests.cc
@@ -292,14 +292,11 @@ class IndexEnv : public ::testing::Test {
   virtual void SetUp() {
     initLog();
     taosRemoveDir(path);
-    opts = indexOptsCreate(1024 * 1024 * 8);
-    int ret = indexOpen(opts, path, &index);
+    SIndexOpts opts = {.cacheSize = 1024 * 1024 * 4};
+    int        ret = indexOpen(&opts, path, &index);
     assert(ret == 0);
   }
-  virtual void TearDown() {
-    indexClose(index);
-    indexOptsDestroy(opts);
-  }
+  virtual void TearDown() { indexClose(index); }
 
   const char* path = TD_TMP_DIR_PATH "tindex";
   SIndexOpts* opts;
@@ -700,8 +697,8 @@ class IndexObj {
       taosMkDir(dir.c_str());
     }
     taosMkDir(dir.c_str());
-    opts = indexOptsCreate(1024 * 1024 * 4);
-    int ret = indexOpen(opts, dir.c_str(), &idx);
+    SIndexOpts opts = {.cacheSize = 1024 * 1024 * 4};
+    int        ret = indexOpen(&opts, dir.c_str(), &idx);
     if (ret != 0) {
       // opt
       std::cout << "failed to open index: %s" << dir << std::endl;
-- 
GitLab