From 9f0152239d9bacda1168e1de5568ef1af5362a9d Mon Sep 17 00:00:00 2001
From: dapan1121 <wpan@taosdata.com>
Date: Tue, 12 Jul 2022 14:56:12 +0800
Subject: [PATCH] fix: fix stop query

---
 source/libs/catalog/src/catalog.c |  1 +
 source/util/src/tref.c            |  2 +-
 tests/script/api/stopquery.c      | 14 ++++++++++----
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/source/libs/catalog/src/catalog.c b/source/libs/catalog/src/catalog.c
index 3a7ad4a2d6..1b7f53ae67 100644
--- a/source/libs/catalog/src/catalog.c
+++ b/source/libs/catalog/src/catalog.c
@@ -1293,6 +1293,7 @@ void catalogDestroy(void) {
 
   if (!taosCheckCurrentInDll()) {
     ctgClearCacheEnqueue(NULL, true, true, true);
+    taosThreadJoin(gCtgMgmt.updateThread, NULL);
   }
 
   taosHashCleanup(gCtgMgmt.pCluster);
diff --git a/source/util/src/tref.c b/source/util/src/tref.c
index 2e4c33bc87..9cd849b9be 100644
--- a/source/util/src/tref.c
+++ b/source/util/src/tref.c
@@ -431,7 +431,7 @@ static int32_t taosDecRefCount(int32_t rsetId, int64_t rid, int32_t remove) {
       }
       released = 1;
     } else {
-      uTrace("rsetId:%d p:%p rid:%" PRId64 " is released", rsetId, pNode->p, rid);
+      uTrace("rsetId:%d p:%p rid:%" PRId64 " is released, remain count %d", rsetId, pNode->p, rid, pNode->count);
     }
   } else {
     uTrace("rsetId:%d rid:%" PRId64 " is not there, failed to release/remove", rsetId, rid);
diff --git a/tests/script/api/stopquery.c b/tests/script/api/stopquery.c
index eeaf9295d9..a42e9e2d44 100644
--- a/tests/script/api/stopquery.c
+++ b/tests/script/api/stopquery.c
@@ -36,7 +36,7 @@ int64_t st, et;
 char hostName[128];
 char dbName[128];
 char tbName[128];
-int32_t runTimes = 10000;
+int32_t runTimes = 1000;
 
 typedef struct {
   int       id;
@@ -88,6 +88,7 @@ static void sqExecSQLE(TAOS *taos, char *command) {
 
 void sqExit(char* prefix, const char* errMsg) {
   fprintf(stderr, "%s error: %s\n", prefix, errMsg);
+  sleep(10000);
   exit(1);
 }
 
@@ -141,16 +142,20 @@ void sqCloseFetchCb(void *param, TAOS_RES *pRes, int numOfRows) {
   taos_close(qParam->taos);
 
   *qParam->end = 1;
+  
+  taos_free_result(pRes);
 }
 
 void sqCloseQueryCb(void *param, TAOS_RES *pRes, int code) {
   SSP_CB_PARAM *qParam = (SSP_CB_PARAM *)param;
   if (code == 0 && pRes) {
     if (qParam->fetch) {
-      taos_fetch_rows_a(pRes, sqFreeFetchCb, param);
+      taos_fetch_rows_a(pRes, sqCloseFetchCb, param);
     } else {
       taos_close(qParam->taos);
       *qParam->end = 1;
+      
+      taos_free_result(pRes);
     }
   } else {
     sqExit("select", taos_errstr(pRes));
@@ -358,6 +363,7 @@ int sqCloseSyncQuery(bool fetch) {
     }
     
     taos_close(taos);
+    taos_free_result(pRes);
   }
   CASE_LEAVE();  
 }
@@ -382,7 +388,7 @@ int sqCloseAsyncQuery(bool fetch) {
     SSP_CB_PARAM param = {0};
     param.fetch = fetch;
     param.end = &qEnd;
-    taos_query_a(taos, sql, sqFreeQueryCb, &param);
+    taos_query_a(taos, sql, sqCloseQueryCb, &param);
     while (0 == qEnd) {
       usleep(5000);
     }
@@ -640,7 +646,7 @@ void sqRunAllCase(void) {
   int32_t l = 5;
   while (l) {
     printf("%d\n", l--);
-    sleep(1);
+    sleep(1000);
   }
 }