From c96085808845a817d058ffcab364d4445f332c9d Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Thu, 20 Aug 2020 14:24:11 +0800
Subject: [PATCH] fix jdbc memory leaks. #3098

---
 src/client/src/TSDBJNIConnector.c              | 18 ++++++++++++++++++
 .../com/taosdata/jdbc/TSDBJNIConnector.java    |  6 ++++++
 .../java/com/taosdata/jdbc/TSDBStatement.java  | 16 ++++++++++++----
 3 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/src/client/src/TSDBJNIConnector.c b/src/client/src/TSDBJNIConnector.c
index 0dd5e13181..b25f620508 100644
--- a/src/client/src/TSDBJNIConnector.c
+++ b/src/client/src/TSDBJNIConnector.c
@@ -335,6 +335,24 @@ JNIEXPORT jlong JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_getResultSetImp(
   return tres;
 }
 
+JNIEXPORT jint JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_isUpdateQueryImp(JNIEnv *env, jobject jobj, jlong con,
+                                                                                jlong tres) {
+  TAOS *tscon = (TAOS *)con;
+  if (tscon == NULL) {
+    jniError("jobj:%p, connection is closed", jobj);
+    return JNI_CONNECTION_NULL;
+  }
+
+  if ((void *)tres == NULL) {
+    jniError("jobj:%p, conn:%p, resultset is null", jobj, tscon);
+    return JNI_RESULT_SET_NULL;
+  }
+
+  SSqlObj *pSql = (TAOS_RES *)tres;
+
+  return (tscIsUpdateQuery(pSql)? 1:0);
+}
+
 JNIEXPORT jint JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_freeResultSetImp(JNIEnv *env, jobject jobj, jlong con,
                                                                                 jlong res) {
   TAOS *tscon = (TAOS *)con;
diff --git a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBJNIConnector.java b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBJNIConnector.java
index 25f7f8576d..0cd185de50 100755
--- a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBJNIConnector.java
+++ b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBJNIConnector.java
@@ -171,6 +171,12 @@ public class TSDBJNIConnector {
     }
 
     private native long getResultSetImp(long connection, long pSql);
+    
+    public boolean isUpdateQuery(long pSql) {
+    	return isUpdateQueryImp(this.taos, pSql) == 1? true:false;
+    }
+    
+    private native long isUpdateQueryImp(long connection, long pSql);
 
     /**
      * Free resultset operation from C to release resultset pointer by JNI
diff --git a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBStatement.java b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBStatement.java
index 54598212ed..075a351661 100644
--- a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBStatement.java
+++ b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBStatement.java
@@ -60,13 +60,21 @@ public class TSDBStatement implements Statement {
 		if (resultSetPointer == TSDBConstants.JNI_CONNECTION_NULL) {
 			this.connecter.freeResultSet(pSql);
 			throw new SQLException(TSDBConstants.FixErrMsg(TSDBConstants.JNI_CONNECTION_NULL));
-		} else if (resultSetPointer == TSDBConstants.JNI_NULL_POINTER) {
-//			create/insert/update/del/alter
+		}
+
+        // create/insert/update/delete/alter
+		if (resultSetPointer == TSDBConstants.JNI_NULL_POINTER) {
 			this.connecter.freeResultSet(pSql);
 			return null;
-		} else {
+		}
+		
+		if (!this.connecter.isUpdateQuery(pSql)) {
 			return new TSDBResultSet(this.connecter, resultSetPointer);
+		} else {
+			this.connecter.freeResultSet(pSql);
+			return null;
 		}
+		
 	}
 
 	public int executeUpdate(String sql) throws SQLException {
@@ -81,7 +89,7 @@ public class TSDBStatement implements Statement {
 		if (resultSetPointer == TSDBConstants.JNI_CONNECTION_NULL) {
 			this.connecter.freeResultSet(pSql);
 			throw new SQLException(TSDBConstants.FixErrMsg(TSDBConstants.JNI_CONNECTION_NULL));
-		}	
+		}
 
 		int num = this.connecter.getAffectedRows(pSql);
 		this.connecter.freeResultSet(pSql);
-- 
GitLab