(doris) branch branch-2.1 updated: [Fix](jdbc-scanner) Fix jdbc scanner memory leak because it didn't close `outputTable`. (#41266)

[hellostephen]

This is an automated email from the ASF dual-hosted git repository.

hellostephen pushed a commit to branch branch-2.1
in repository https://gitbox.apache.org/repos/asf/doris.git


The following commit(s) were added to refs/heads/branch-2.1 by this push:
     new 306af52aa23 [Fix](jdbc-scanner) Fix jdbc scanner memory leak because 
it didn't close `outputTable`.  (#41266)
306af52aa23 is described below

commit 306af52aa2375388afcc3cc1cbcfd886e6d202eb
Author: Qi Chen <kaka11.c...@gmail.com>
AuthorDate: Wed Sep 25 17:35:13 2024 +0800

    [Fix](jdbc-scanner) Fix jdbc scanner memory leak because it didn't close 
`outputTable`.  (#41266)
    
    ## Proposed changes
    
    Backport #41041.
---
 .../src/main/java/org/apache/doris/jdbc/BaseJdbcExecutor.java        | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git 
a/fe/be-java-extensions/jdbc-scanner/src/main/java/org/apache/doris/jdbc/BaseJdbcExecutor.java
 
b/fe/be-java-extensions/jdbc-scanner/src/main/java/org/apache/doris/jdbc/BaseJdbcExecutor.java
index 67a0cf5a636..5f132871a0c 100644
--- 
a/fe/be-java-extensions/jdbc-scanner/src/main/java/org/apache/doris/jdbc/BaseJdbcExecutor.java
+++ 
b/fe/be-java-extensions/jdbc-scanner/src/main/java/org/apache/doris/jdbc/BaseJdbcExecutor.java
@@ -99,6 +99,9 @@ public abstract class BaseJdbcExecutor implements 
JdbcExecutor {
     }
 
     public void close() throws Exception {
+        if (outputTable != null) {
+            outputTable.close();
+        }
         try {
             if (stmt != null && !stmt.isClosed()) {
                 try {
@@ -111,8 +114,8 @@ public abstract class BaseJdbcExecutor implements 
JdbcExecutor {
             if (conn != null && resultSet != null) {
                 abortReadConnection(conn, resultSet);
             }
-            closeResources(resultSet, stmt, conn);
         } finally {
+            closeResources(resultSet, stmt, conn);
             if (config.getConnectionPoolMinSize() == 0 && hikariDataSource != 
null) {
                 hikariDataSource.close();
                 
JdbcDataSource.getDataSource().getSourcesMap().remove(config.createCacheKey());


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org