xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

[TD-149] add callback func to cache

This commit is contained in:
Shengliang Guan 2020-05-13 15:22:49 +08:00
parent 5b459cf8fe
commit f3b80c84e5
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/mnode/src/mgmtShell.c
View File

@ -477,10 +477,10 @@ void mgmtSendSimpleResp(void *thandle, int32_t code) {
bool mgmtCheckQhandle(uint64_t qhandle) { bool mgmtCheckQhandle(uint64_t qhandle) {
void *pSaved = taosCacheAcquireByData(tsQhandleCache, (void *)qhandle); void *pSaved = taosCacheAcquireByData(tsQhandleCache, (void *)qhandle);
if (pSaved == (void *)qhandle) { if (pSaved == (void *)qhandle) {
mTrace("qhandle:%p is retrived", qhandle); mTrace("show:%p, is retrieved", qhandle);
return true; return true;
} else { } else {
mTrace("qhandle:%p is already released", qhandle); mTrace("show:%p, is already released", qhandle);
return false; return false;
} }
} }
@ -492,7 +492,7 @@ void* mgmtSaveQhandle(void *qhandle, int32_t size) {
void *newQhandle = taosCachePut(tsQhandleCache, key, qhandle, size, 60); void *newQhandle = taosCachePut(tsQhandleCache, key, qhandle, size, 60);
free(qhandle); free(qhandle);
mTrace("qhandle:%p is saved", newQhandle); mTrace("show:%p, is saved", newQhandle);
return newQhandle; return newQhandle;
} }
@ -501,12 +501,12 @@ void* mgmtSaveQhandle(void *qhandle, int32_t size) {
static void mgmtFreeShowObj(void *data) { static void mgmtFreeShowObj(void *data) {
SShowObj *pShow = data; SShowObj *pShow = data;
//sdbFreeIter(pShow->pIter); sdbFreeIter(pShow->pIter);
mTrace("qhandle:%p is destroyed", pShow); mTrace("show:%p, is destroyed", pShow);
} }
void mgmtFreeQhandle(void *qhandle, bool forceRemove) { 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); taosCacheRelease(tsQhandleCache, &qhandle, forceRemove);
} }

2
src/util/src/tcache.c
View File

@ -401,7 +401,7 @@ SCacheObj *taosCacheInitWithCb(void *tmrCtrl, int64_t refreshTime, void (*freeCb
} }
// set free cache node callback function for hash table // set free cache node callback function for hash table
// taosHashSetFreecb(pCacheObj->pHashTable, taosFreeNode); taosHashSetFreecb(pCacheObj->pHashTable, taosFreeNode);
pCacheObj->freeFp = freeCb; pCacheObj->freeFp = freeCb;
pCacheObj->refreshTime = refreshTime * 1000; pCacheObj->refreshTime = refreshTime * 1000;