From 6a88d306c8dd7c80f9974297a2ec6fd9501d430b Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Sat, 10 Oct 2020 22:38:56 +0800
Subject: [PATCH] [td-1641]

---
 src/client/src/tscSubquery.c  |  7 -------
 src/client/src/tscUtil.c      |  2 +-
 src/os/src/detail/osSysinfo.c |  4 ++--
 src/util/src/tcache.c         | 17 +++++++++--------
 4 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/src/client/src/tscSubquery.c b/src/client/src/tscSubquery.c
index 68ba3cd0bd..0c57b94054 100644
--- a/src/client/src/tscSubquery.c
+++ b/src/client/src/tscSubquery.c
@@ -1516,9 +1516,6 @@ static void tscFreeSubSqlObj(SRetrieveSupport *trsupport, SSqlObj *pSql) {
   SSqlObj *pParentSql = trsupport->pParentSql;
 
   assert(pSql == pParentSql->pSubs[index]);
-  pParentSql->pSubs[index] = NULL;
-
-  taos_free_result(pSql);
   taosTFree(trsupport->localBuffer);
   taosTFree(trsupport);
 }
@@ -1907,10 +1904,6 @@ static void multiVnodeInsertFinalize(void* param, TAOS_RES* tres, int numOfRows)
     pParentObj->res.code = pSql->res.code;
   }
 
-  assert(pParentObj->pSubs[pSupporter->index] == tres);
-
-  pParentObj->pSubs[pSupporter->index] = 0;
-  taos_free_result(tres);
   taosTFree(pSupporter);
 
   if (atomic_sub_fetch_32(&pState->numOfRemain, 1) > 0) {
diff --git a/src/client/src/tscUtil.c b/src/client/src/tscUtil.c
index c8a3d2607a..f6bb97e52f 100644
--- a/src/client/src/tscUtil.c
+++ b/src/client/src/tscUtil.c
@@ -415,7 +415,7 @@ void tscFreeSqlObj(SSqlObj* pSql) {
 
   tscDebug("%p start to free sqlObj", pSql);
 
-//  tscFreeSubobj(pSql);
+  tscFreeSubobj(pSql);
   tscPartiallyFreeSqlObj(pSql);
 
   pSql->signature = NULL;
diff --git a/src/os/src/detail/osSysinfo.c b/src/os/src/detail/osSysinfo.c
index f6470fc3e1..8df671f9c8 100644
--- a/src/os/src/detail/osSysinfo.c
+++ b/src/os/src/detail/osSysinfo.c
@@ -203,7 +203,7 @@ static void taosGetSystemTimezone() {
   snprintf(tsTimezone, TSDB_TIMEZONE_LEN, "%s (%s, %s%02d00)", buf, tzname[daylight], tz >= 0 ? "+" : "-", abs(tz));
 
   // cfg_timezone->cfgStatus = TAOS_CFG_CSTATUS_DEFAULT;
-  uInfo("timezone not configured, set to system default:%s", tsTimezone);
+  uWarn("timezone not configured, set to system default:%s", tsTimezone);
 }
 
 /*
@@ -235,7 +235,7 @@ static void taosGetSystemLocale() {  // get and set default locale
       strcpy(tsLocale, "en_US.UTF-8");
     } else {
       tstrncpy(tsLocale, locale, TSDB_LOCALE_LEN);
-      uError("locale not configured, set to system default:%s", tsLocale);
+      uWarn("locale not configured, set to system default:%s", tsLocale);
     }
   }
 
diff --git a/src/util/src/tcache.c b/src/util/src/tcache.c
index 628f1c6c55..2896481574 100644
--- a/src/util/src/tcache.c
+++ b/src/util/src/tcache.c
@@ -567,29 +567,30 @@ void taosTrashcanEmpty(SCacheObj *pCacheObj, bool force) {
 
   if (pCacheObj->numOfElemsInTrash == 0) {
     if (pCacheObj->pTrash != NULL) {
+      pCacheObj->pTrash = NULL;
       uError("cache:%s, key:inconsistency data in cache, numOfElem in trashcan:%d", pCacheObj->name, pCacheObj->numOfElemsInTrash);
     }
 
-    pCacheObj->pTrash = NULL;
     __cache_unlock(pCacheObj);
     return;
   }
 
-  STrashElem *pElem = pCacheObj->pTrash;
+  const char* stat[] = {"false", "true"};
+  uDebug("cache:%s start to cleanup trashcan, numOfElem in trashcan:%d, free:%s", pCacheObj->name,
+      pCacheObj->numOfElemsInTrash, (force? stat[1]:stat[0]));
 
+  STrashElem *pElem = pCacheObj->pTrash;
   while (pElem) {
     T_REF_VAL_CHECK(pElem->pData);
-    if (pElem->next == pElem) {
-      pElem->next = NULL;
-    }
+    assert(pElem->next != pElem && pElem->prev != pElem);
 
     if (force || (T_REF_VAL_GET(pElem->pData) == 0)) {
       uDebug("cache:%s, key:%p, %p removed from trashcan. numOfElem in trashcan:%d", pCacheObj->name, pElem->pData->key, pElem->pData->data,
              pCacheObj->numOfElemsInTrash - 1);
 
-      STrashElem *p = pElem;
-      pElem = doRemoveElemInTrashcan(pCacheObj, p);
-      doDestroyTrashcanElem(pCacheObj, p);
+      doRemoveElemInTrashcan(pCacheObj, pElem);
+      doDestroyTrashcanElem(pCacheObj, pElem);
+      pElem = pCacheObj->pTrash;
     } else {
       pElem = pElem->next;
     }
-- 
GitLab