From 0ef20b379be67e042318d870b829608c4bb7f24c Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Thu, 3 Sep 2020 10:31:06 +0800
Subject: [PATCH] [td-225]

---
 src/util/src/tcache.c         | 49 +++++++++++++++++++----------------
 src/util/tests/CMakeLists.txt |  2 +-
 src/util/tests/cacheTest.cpp  |  7 -----
 3 files changed, 27 insertions(+), 31 deletions(-)

diff --git a/src/util/src/tcache.c b/src/util/src/tcache.c
index 3b14254fff..e5526647cb 100644
--- a/src/util/src/tcache.c
+++ b/src/util/src/tcache.c
@@ -378,40 +378,43 @@ void taosCacheRelease(SCacheObj *pCacheObj, void **data, bool _remove) {
     } else {
       // NOTE: remove it from hash in the first place, otherwise, the pNode may have been released by other thread
       // when reaches here.
-      SCacheDataNode* p = NULL;
-      int32_t ret = taosHashRemoveWithData(pCacheObj->pHashTable, pNode->key, pNode->keySize, &p, sizeof(void*));
+      SCacheDataNode *p = NULL;
+      int32_t ret = taosHashRemoveWithData(pCacheObj->pHashTable, pNode->key, pNode->keySize, &p, sizeof(void *));
       ref = T_REF_DEC(pNode);
 
       // successfully remove from hash table, if failed, this node must have been move to trash already, do nothing.
       // note that the remove operation can be executed only once.
       if (ret == 0) {
-	if (p != pNode) {
-	uDebug("cache:%s, key:%p, successfully removed a new entry:%p, refcnt:%d, prev entry:%p has been removed by others already", pCacheObj->name, pNode->key, p->data, T_REF_VAL_GET(p), pNode->data);
-	assert(p->pTNodeHeader == NULL);
-	taosAddToTrash(pCacheObj, p);
-	} else {
+        if (p != pNode) {
+          uDebug( "cache:%s, key:%p, successfully removed a new entry:%p, refcnt:%d, prev entry:%p has been removed by "
+              "others already", pCacheObj->name, pNode->key, p->data, T_REF_VAL_GET(p), pNode->data);
 
-        uDebug("cache:%s, key:%p, %p successfully removed from hash table, refcnt:%d", pCacheObj->name, pNode->key, pNode->data, ref);
-        if (ref > 0) {
-          assert(pNode->pTNodeHeader == NULL);
+          assert(p->pTNodeHeader == NULL);
+          taosAddToTrash(pCacheObj, p);
+        } else {
+          uDebug("cache:%s, key:%p, %p successfully removed from hash table, refcnt:%d", pCacheObj->name, pNode->key,
+                 pNode->data, ref);
+          if (ref > 0) {
+            assert(pNode->pTNodeHeader == NULL);
 
-          taosAddToTrash(pCacheObj, pNode);
-        } else {  // ref == 0
-          atomic_sub_fetch_64(&pCacheObj->totalSize, pNode->size);
+            taosAddToTrash(pCacheObj, pNode);
+          } else {  // ref == 0
+            atomic_sub_fetch_64(&pCacheObj->totalSize, pNode->size);
 
-          int32_t size = (int32_t)taosHashGetSize(pCacheObj->pHashTable);
-          uDebug("cache:%s, key:%p, %p is destroyed from cache, size:%dbytes, num:%d size:%" PRId64 "bytes",
-                 pCacheObj->name, pNode->key, pNode->data, pNode->size, size, pCacheObj->totalSize);
+            int32_t size = (int32_t)taosHashGetSize(pCacheObj->pHashTable);
+            uDebug("cache:%s, key:%p, %p is destroyed from cache, size:%dbytes, num:%d size:%" PRId64 "bytes",
+                   pCacheObj->name, pNode->key, pNode->data, pNode->size, size, pCacheObj->totalSize);
 
-          if (pCacheObj->freeFp) {
-            pCacheObj->freeFp(pNode->data);
+            if (pCacheObj->freeFp) {
+              pCacheObj->freeFp(pNode->data);
+            }
+
+            free(pNode);
           }
-
-          free(pNode);
         }
-	}
       } else {
-        uDebug("cache:%s, key:%p, %p has been removed from hash table by other thread already, refcnt:%d", pCacheObj->name, pNode->key, pNode->data, ref);
+        uDebug("cache:%s, key:%p, %p has been removed from hash table by other thread already, refcnt:%d",
+               pCacheObj->name, pNode->key, pNode->data, ref);
       }
     }
 
@@ -513,7 +516,7 @@ void taosAddToTrash(SCacheObj *pCacheObj, SCacheDataNode *pNode) {
   pCacheObj->numOfElemsInTrash++;
   __cache_unlock(pCacheObj);
 
-  uDebug("%s key:%p, %p move to trash, numOfElem in trash:%d", pCacheObj->name, pNode->key, pNode->data,
+  uDebug("cache:%s key:%p, %p move to trash, numOfElem in trash:%d", pCacheObj->name, pNode->key, pNode->data,
       pCacheObj->numOfElemsInTrash);
 }
 
diff --git a/src/util/tests/CMakeLists.txt b/src/util/tests/CMakeLists.txt
index 09523cbfb4..8687a8005d 100644
--- a/src/util/tests/CMakeLists.txt
+++ b/src/util/tests/CMakeLists.txt
@@ -10,6 +10,6 @@ IF (HEADER_GTEST_INCLUDE_DIR AND LIB_GTEST_STATIC_DIR)
     INCLUDE_DIRECTORIES(${HEADER_GTEST_INCLUDE_DIR})
     AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR} SOURCE_LIST)
 
-    ADD_EXECUTABLE(utilTest ./cacheTest.cpp ./hashTest.cpp)
+    ADD_EXECUTABLE(utilTest ${SOURCE_LIST})
     TARGET_LINK_LIBRARIES(utilTest tutil common osdetail gtest pthread gcov)
 ENDIF()
diff --git a/src/util/tests/cacheTest.cpp b/src/util/tests/cacheTest.cpp
index e0debd53f4..51221e0b35 100644
--- a/src/util/tests/cacheTest.cpp
+++ b/src/util/tests/cacheTest.cpp
@@ -1,16 +1,9 @@
 #include "os.h"
 #include <iostream>
 #include <gtest/gtest.h>
-#include <sys/time.h>
 
 #include "taos.h"
-//#include "tsdb.h"
-
-//#include "testCommon.h"
-#include "tstoken.h"
-#include "tutil.h"
 #include "tcache.h"
-#include "ttimer.h"
 
 namespace {
 int32_t tsMaxMgmtConnections = 10000;