From 9d1619c3b90b0948232913af83d8699bd40f09ab Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Mon, 14 Sep 2020 23:37:45 +0800
Subject: [PATCH] [td-1391] refactor

---
 src/client/src/tscSql.c  | 2 ++
 src/client/src/tscUtil.c | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/client/src/tscSql.c b/src/client/src/tscSql.c
index f02e587455..4a001a2ce4 100644
--- a/src/client/src/tscSql.c
+++ b/src/client/src/tscSql.c
@@ -286,9 +286,11 @@ void taos_close(TAOS *taos) {
   assert(ref >= 0);
 
   if (ref > 0) {
+    tscDebug("%p %d remain sqlObjs, do not close dnodeConn:%p", pObj, ref, pObj->pDnodeConn);
     return;
   }
 
+  tscDebug("%p all sqlObj are freed, free tscObj, dnodeConn:%p", pObj, pObj->pDnodeConn);
   tscCloseTscObj(pObj);
 }
 
diff --git a/src/client/src/tscUtil.c b/src/client/src/tscUtil.c
index f06d36e0c6..9b3f5927ab 100644
--- a/src/client/src/tscUtil.c
+++ b/src/client/src/tscUtil.c
@@ -772,6 +772,7 @@ void tscCloseTscObj(STscObj* pObj) {
   pObj->signature = NULL;
   taosTmrStopA(&(pObj->pTimer));
 
+  void* p = pObj->pDnodeConn;
   if (pObj->pDnodeConn != NULL) {
     rpcClose(pObj->pDnodeConn);
     pObj->pDnodeConn = NULL;
@@ -779,7 +780,7 @@ void tscCloseTscObj(STscObj* pObj) {
 
   pthread_mutex_destroy(&pObj->mutex);
 
-  tscDebug("%p DB connection is closed, dnodeConn:%p", pObj, pObj->pDnodeConn);
+  tscDebug("%p DB connection is closed, dnodeConn:%p", pObj, p);
   taosTFree(pObj);
 }
 
-- 
GitLab