From ca7ca2f1e33a86322890b87beb92e7ba37434d4a Mon Sep 17 00:00:00 2001
From: yihaoDeng <luomoxyz@126.com>
Date: Thu, 14 Jul 2022 19:23:01 +0800
Subject: [PATCH] refactor code

---
 source/libs/index/src/indexCache.c   | 18 +++++++++---------
 source/libs/index/test/indexTests.cc | 11 +++++++----
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/source/libs/index/src/indexCache.c b/source/libs/index/src/indexCache.c
index 05ce418037..1e9ec4a841 100644
--- a/source/libs/index/src/indexCache.c
+++ b/source/libs/index/src/indexCache.c
@@ -462,8 +462,8 @@ Iterate* idxCacheIteratorCreate(IndexCache* cache) {
   if (cache->imm == NULL) {
     return NULL;
   }
-  Iterate* iiter = taosMemoryCalloc(1, sizeof(Iterate));
-  if (iiter == NULL) {
+  Iterate* iter = taosMemoryCalloc(1, sizeof(Iterate));
+  if (iter == NULL) {
     return NULL;
   }
   taosThreadMutexLock(&cache->mtx);
@@ -471,15 +471,15 @@ Iterate* idxCacheIteratorCreate(IndexCache* cache) {
   idxMemRef(cache->imm);
 
   MemTable* tbl = cache->imm;
-  iiter->val.val = taosArrayInit(1, sizeof(uint64_t));
-  iiter->val.colVal = NULL;
-  iiter->iter = tbl != NULL ? tSkipListCreateIter(tbl->mem) : NULL;
-  iiter->next = idxCacheIteratorNext;
-  iiter->getValue = idxCacheIteratorGetValue;
+  iter->val.val = taosArrayInit(1, sizeof(uint64_t));
+  iter->val.colVal = NULL;
+  iter->iter = tbl != NULL ? tSkipListCreateIter(tbl->mem) : NULL;
+  iter->next = idxCacheIteratorNext;
+  iter->getValue = idxCacheIteratorGetValue;
 
   taosThreadMutexUnlock(&cache->mtx);
 
-  return iiter;
+  return iter;
 }
 void idxCacheIteratorDestroy(Iterate* iter) {
   if (iter == NULL) {
@@ -564,13 +564,13 @@ int idxCachePut(void* cache, SIndexTerm* term, uint64_t uid) {
   idxMemUnRef(tbl);
 
   taosThreadMutexUnlock(&pCache->mtx);
-
   idxCacheUnRef(pCache);
   return 0;
   // encode end
 }
 void idxCacheForceToMerge(void* cache) {
   IndexCache* pCache = cache;
+
   idxCacheRef(pCache);
   taosThreadMutexLock(&pCache->mtx);
 
diff --git a/source/libs/index/test/indexTests.cc b/source/libs/index/test/indexTests.cc
index 3c1f148ae4..5b76de2ef8 100644
--- a/source/libs/index/test/indexTests.cc
+++ b/source/libs/index/test/indexTests.cc
@@ -292,8 +292,9 @@ class IndexEnv : public ::testing::Test {
   virtual void SetUp() {
     initLog();
     taosRemoveDir(path);
-    SIndexOpts opts = {.cacheSize = 1024 * 1024 * 4};
-    int        ret = indexOpen(&opts, path, &index);
+    SIndexOpts opts;
+    opts.cacheSize = 1024 * 1024 * 4;
+    int ret = indexOpen(&opts, path, &index);
     assert(ret == 0);
   }
   virtual void TearDown() { indexClose(index); }
@@ -697,8 +698,10 @@ class IndexObj {
       taosMkDir(dir.c_str());
     }
     taosMkDir(dir.c_str());
-    SIndexOpts opts = {.cacheSize = 1024 * 1024 * 4};
-    int        ret = indexOpen(&opts, dir.c_str(), &idx);
+    SIndexOpts opts;
+    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