From e219a43999865df26c6984f005fa82cff6bfecaa Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Wed, 28 Oct 2020 21:58:00 +0800
Subject: [PATCH] [td-1804]

---
 src/client/src/tscServer.c | 1 +
 src/util/src/tcache.c      | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/client/src/tscServer.c b/src/client/src/tscServer.c
index a0841fa234..b65e59b028 100644
--- a/src/client/src/tscServer.c
+++ b/src/client/src/tscServer.c
@@ -207,6 +207,7 @@ void tscProcessActivityTimer(void *handle, void *tmrId) {
 
   assert(*pHB->self == pHB);
 
+  pHB->retry = 0;  // reset retry counter
   int32_t code = tscProcessSql(pHB);
   taosCacheRelease(tscObjCache, (void**) &p, false);
 
diff --git a/src/util/src/tcache.c b/src/util/src/tcache.c
index 6e20c1708d..bc795a7434 100644
--- a/src/util/src/tcache.c
+++ b/src/util/src/tcache.c
@@ -335,7 +335,7 @@ void *taosCacheTransfer(SCacheObj *pCacheObj, void **data) {
 }
 
 void taosCacheRelease(SCacheObj *pCacheObj, void **data, bool _remove) {
-  if (pCacheObj == NULL || taosHashGetSize(pCacheObj->pHashTable) + pCacheObj->numOfElemsInTrash == 0) {
+  if (pCacheObj == NULL) {
     return;
   }
 
-- 
GitLab