From f3b80c84e5c58e9a65c0cb0d5749990202087a45 Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Wed, 13 May 2020 15:22:49 +0800
Subject: [PATCH] [TD-149] add callback func to cache

---
 src/mnode/src/mgmtShell.c | 12 ++++++------
 src/util/src/tcache.c     |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/mnode/src/mgmtShell.c b/src/mnode/src/mgmtShell.c
index 2e3ef7384a..804572b9ff 100644
--- a/src/mnode/src/mgmtShell.c
+++ b/src/mnode/src/mgmtShell.c
@@ -477,10 +477,10 @@ void mgmtSendSimpleResp(void *thandle, int32_t code) {
 bool mgmtCheckQhandle(uint64_t qhandle) {
   void *pSaved = taosCacheAcquireByData(tsQhandleCache, (void *)qhandle);
   if (pSaved == (void *)qhandle) {
-    mTrace("qhandle:%p is retrived", qhandle);
+    mTrace("show:%p, is retrieved", qhandle);
     return true;
   } else {
-    mTrace("qhandle:%p is already released", qhandle);
+    mTrace("show:%p, is already released", qhandle);
     return false;
   }
 }
@@ -492,7 +492,7 @@ void* mgmtSaveQhandle(void *qhandle, int32_t size) {
     void *newQhandle = taosCachePut(tsQhandleCache, key, qhandle, size, 60);
     free(qhandle);
     
-    mTrace("qhandle:%p is saved", newQhandle);
+    mTrace("show:%p, is saved", newQhandle);
     return newQhandle;
   }
   
@@ -501,12 +501,12 @@ void* mgmtSaveQhandle(void *qhandle, int32_t size) {
 
 static void mgmtFreeShowObj(void *data) {
   SShowObj *pShow = data;
-  //sdbFreeIter(pShow->pIter);
-  mTrace("qhandle:%p is destroyed", pShow);
+  sdbFreeIter(pShow->pIter);
+  mTrace("show:%p, is destroyed", pShow);
 }
 
 void mgmtFreeQhandle(void *qhandle, bool forceRemove) {
-  mTrace("qhandle:%p is released", qhandle);
+  mTrace("show:%p, is released, force:%s", qhandle, forceRemove ? "true" : "false");
   taosCacheRelease(tsQhandleCache, &qhandle, forceRemove);
 }
 
diff --git a/src/util/src/tcache.c b/src/util/src/tcache.c
index 7d8cb1faa4..0c4978dc5c 100644
--- a/src/util/src/tcache.c
+++ b/src/util/src/tcache.c
@@ -401,7 +401,7 @@ SCacheObj *taosCacheInitWithCb(void *tmrCtrl, int64_t refreshTime, void (*freeCb
   }
   
   // set free cache node callback function for hash table
-  // taosHashSetFreecb(pCacheObj->pHashTable, taosFreeNode);
+  taosHashSetFreecb(pCacheObj->pHashTable, taosFreeNode);
   
   pCacheObj->freeFp = freeCb;
   pCacheObj->refreshTime = refreshTime * 1000;
-- 
GitLab