From 16ac4b66c92cd3381a6348ee0295cc0bc772c968 Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Sat, 8 Aug 2020 18:07:51 +0800
Subject: [PATCH] [td-225] fix memory leak

---
 src/client/src/tscSystem.c            |  3 ++-
 src/plugins/monitor/src/monitorMain.c | 24 +++++++++++++++++-------
 src/query/src/qTokenizer.c            |  4 ++++
 src/util/inc/tstoken.h                |  2 ++
 4 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/src/client/src/tscSystem.c b/src/client/src/tscSystem.c
index 878fdd500f..c742db42ab 100644
--- a/src/client/src/tscSystem.c
+++ b/src/client/src/tscSystem.c
@@ -164,7 +164,8 @@ void taos_cleanup() {
     taosCleanUpScheduler(tscQhandle);
     tscQhandle = NULL;
   }
-  
+
+  taosCleanupKeywordsTable();
   taosCloseLog();
   
   taosTmrCleanUp(tscTmr);
diff --git a/src/plugins/monitor/src/monitorMain.c b/src/plugins/monitor/src/monitorMain.c
index 8bf9277a43..6c7ecbb951 100644
--- a/src/plugins/monitor/src/monitorMain.c
+++ b/src/plugins/monitor/src/monitorMain.c
@@ -131,7 +131,10 @@ static void monitorInitConn(void *para, void *unused) {
 }
 
 static void monitorInitConnCb(void *param, TAOS_RES *result, int32_t code) {
-  if (code < 0) {
+  // free it firstly in any cases.
+  taos_free_result(result);
+
+  if (code != TSDB_CODE_SUCCESS) {
     monitorError("monitor:%p, connect to database failed, reason:%s", tsMonitorConn.conn, tstrerror(code));
     taos_close(tsMonitorConn.conn);
     tsMonitorConn.conn = NULL;
@@ -214,7 +217,7 @@ static void monitorInitDatabase() {
 }
 
 static void monitorInitDatabaseCb(void *param, TAOS_RES *result, int32_t code) {
-  if (-code == TSDB_CODE_MND_TABLE_ALREADY_EXIST || -code == TSDB_CODE_MND_DB_ALREADY_EXIST || code >= 0) {
+  if (code == TSDB_CODE_MND_TABLE_ALREADY_EXIST || code == TSDB_CODE_MND_DB_ALREADY_EXIST || code >= 0) {
     monitorDebug("monitor:%p, sql success, reason:%s, %s", tsMonitorConn.conn, tstrerror(code), tsMonitorConn.sql);
     if (tsMonitorConn.cmdIndex == MONITOR_CMD_CREATE_TB_LOG) {
       monitorInfo("dnode:%s is started", tsLocalEp);
@@ -226,6 +229,8 @@ static void monitorInitDatabaseCb(void *param, TAOS_RES *result, int32_t code) {
     tsMonitorConn.state = MONITOR_STATE_UN_INIT;
     monitorStartSystemRetry();
   }
+
+  taos_free_result(result);
 }
 
 void monitorStopSystem() {
@@ -238,6 +243,8 @@ void monitorStopSystem() {
   if (tsMonitorConn.timer != NULL) {
     taosTmrStopA(&(tsMonitorConn.timer));
   }
+
+  taos_close(tsMonitorConn.conn);
 }
 
 void monitorCleanUpSystem() {
@@ -250,13 +257,16 @@ static void monitorStartTimer() {
 }
 
 static void dnodeMontiorLogCallback(void *param, TAOS_RES *result, int32_t code) {
-  if (code < 0) {
-    monitorError("monitor:%p, save %s failed, reason:%s", tsMonitorConn.conn, (char *)param, tstrerror(code));
-  } else if (code == 0) {
-    monitorError("monitor:%p, save %s failed, affect rows:%d", tsMonitorConn.conn, (char *)param, code);
+  int32_t c = taos_errno(result);
+
+  if (c != TSDB_CODE_SUCCESS) {
+    monitorError("monitor:%p, save %s failed, reason:%s", tsMonitorConn.conn, (char *)param, tstrerror(c));
   } else {
-    monitorDebug("monitor:%p, save %s info success, reason:%s", tsMonitorConn.conn, (char *)param, tstrerror(code));
+    int32_t rows = taos_affected_rows(result);
+    monitorDebug("monitor:%p, save %s succ, rows:%d", tsMonitorConn.conn, (char *)param, rows);
   }
+
+  taos_free_result(result);
 }
 
 // unit is MB
diff --git a/src/query/src/qTokenizer.c b/src/query/src/qTokenizer.c
index d0191ec732..d730b3cab0 100644
--- a/src/query/src/qTokenizer.c
+++ b/src/query/src/qTokenizer.c
@@ -659,3 +659,7 @@ SSQLToken tStrGetToken(char* str, int32_t* i, bool isPrevOptr, uint32_t numOfIgn
 }
 
 bool isKeyWord(const char* z, int32_t len) { return (tSQLKeywordCode((char*)z, len) != TK_ID); }
+
+void taosCleanupKeywordsTable() {
+  taosHashCleanup(KeywordHashTable);
+}
\ No newline at end of file
diff --git a/src/util/inc/tstoken.h b/src/util/inc/tstoken.h
index 258e62cf8a..705c52af47 100644
--- a/src/util/inc/tstoken.h
+++ b/src/util/inc/tstoken.h
@@ -182,6 +182,8 @@ static FORCE_INLINE int32_t isValidNumber(const SSQLToken* pToken) {
   return (i < pToken->n)? TK_ILLEGAL:type;
 }
 
+void taosCleanupKeywordsTable();
+
 #ifdef __cplusplus
 }
 #endif
-- 
GitLab