You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2025/06/18 16:45:10 UTC

(shardingsphere) branch master updated: Reuse result set retrieval result as variable (#35742)

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

zhangliang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git


The following commit(s) were added to refs/heads/master by this push:
     new 2f0b0369834 Reuse result set retrieval result as variable (#35742)
2f0b0369834 is described below

commit 2f0b03698347c8f18882d92f7dbbe4b666049ea7
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Thu Jun 19 00:45:05 2025 +0800

    Reuse result set retrieval result as variable (#35742)
---
 .../engine/pushdown/jdbc/DriverJDBCPushDownExecuteExecutor.java     | 6 +++---
 .../driver/jdbc/core/resultset/ShardingSphereResultSetFactory.java  | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/jdbc/src/main/java/org/apache/shardingsphere/driver/executor/engine/pushdown/jdbc/DriverJDBCPushDownExecuteExecutor.java b/jdbc/src/main/java/org/apache/shardingsphere/driver/executor/engine/pushdown/jdbc/DriverJDBCPushDownExecuteExecutor.java
index 3f9ffa2cf57..4bd6d6b56df 100644
--- a/jdbc/src/main/java/org/apache/shardingsphere/driver/executor/engine/pushdown/jdbc/DriverJDBCPushDownExecuteExecutor.java
+++ b/jdbc/src/main/java/org/apache/shardingsphere/driver/executor/engine/pushdown/jdbc/DriverJDBCPushDownExecuteExecutor.java
@@ -161,12 +161,12 @@ public final class DriverJDBCPushDownExecuteExecutor {
         return Optional.empty();
     }
     
-    @SuppressWarnings("JDBCResourceOpenedButNotSafelyClosed")
     private List<ResultSet> getResultSets(final List<? extends Statement> statements) throws SQLException {
         List<ResultSet> result = new ArrayList<>(statements.size());
         for (Statement each : statements) {
-            if (null != each.getResultSet()) {
-                result.add(each.getResultSet());
+            ResultSet resultSet = each.getResultSet();
+            if (null != resultSet) {
+                result.add(resultSet);
             }
         }
         return result;
diff --git a/jdbc/src/main/java/org/apache/shardingsphere/driver/jdbc/core/resultset/ShardingSphereResultSetFactory.java b/jdbc/src/main/java/org/apache/shardingsphere/driver/jdbc/core/resultset/ShardingSphereResultSetFactory.java
index fe5de62de54..9e21fc967df 100644
--- a/jdbc/src/main/java/org/apache/shardingsphere/driver/jdbc/core/resultset/ShardingSphereResultSetFactory.java
+++ b/jdbc/src/main/java/org/apache/shardingsphere/driver/jdbc/core/resultset/ShardingSphereResultSetFactory.java
@@ -72,12 +72,12 @@ public final class ShardingSphereResultSetFactory {
                         : columnLabelAndIndexMap);
     }
     
-    @SuppressWarnings("JDBCResourceOpenedButNotSafelyClosed")
     private List<ResultSet> getResultSets() throws SQLException {
         List<ResultSet> result = new ArrayList<>(statements.size());
         for (Statement each : statements) {
-            if (null != each.getResultSet()) {
-                result.add(each.getResultSet());
+            ResultSet resultSet = each.getResultSet();
+            if (null != resultSet) {
+                result.add(resultSet);
             }
         }
         return result;