(shardingsphere) branch master updated: Refactor ShardingSphereStatement (#31544)

[zhangliang]

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 f565a17c0fc Refactor ShardingSphereStatement (#31544)
f565a17c0fc is described below

commit f565a17c0fcb685a9e9d2279fdfb7bc87ef6e19d
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Mon Jun 3 12:33:00 2024 +0800

    Refactor ShardingSphereStatement (#31544)
    
    * Refactor ShardingSphereStatement
    
    * Refactor ShardingSphereStatement
---
 .../driver/jdbc/core/statement/ShardingSpherePreparedStatement.java | 6 +++---
 .../driver/jdbc/core/statement/ShardingSphereStatement.java         | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git 
a/jdbc/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSpherePreparedStatement.java
 
b/jdbc/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSpherePreparedStatement.java
index 3b45b7bc110..664dd06e989 100644
--- 
a/jdbc/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSpherePreparedStatement.java
+++ 
b/jdbc/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSpherePreparedStatement.java
@@ -302,9 +302,9 @@ public final class ShardingSpherePreparedStatement extends 
AbstractPreparedState
         if (null != currentResultSet) {
             return currentResultSet;
         }
-        Optional<ResultSet> advancedResultSet = executor.getResultSet();
-        if (advancedResultSet.isPresent()) {
-            return advancedResultSet.get();
+        Optional<ResultSet> resultSet = executor.getResultSet();
+        if (resultSet.isPresent()) {
+            return resultSet.get();
         }
         if (sqlStatementContext instanceof SelectStatementContext || 
sqlStatementContext.getSqlStatement() instanceof DALStatement) {
             List<ResultSet> resultSets = getResultSets();
diff --git 
a/jdbc/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSphereStatement.java
 
b/jdbc/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSphereStatement.java
index 584a39fe06b..b31ff18bcad 100644
--- 
a/jdbc/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSphereStatement.java
+++ 
b/jdbc/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSphereStatement.java
@@ -331,9 +331,9 @@ public final class ShardingSphereStatement extends 
AbstractStatementAdapter {
         if (null != currentResultSet) {
             return currentResultSet;
         }
-        Optional<ResultSet> advancedResultSet = executor.getResultSet();
-        if (advancedResultSet.isPresent()) {
-            return advancedResultSet.get();
+        Optional<ResultSet> resultSet = executor.getResultSet();
+        if (resultSet.isPresent()) {
+            return resultSet.get();
         }
         if (sqlStatementContext instanceof SelectStatementContext || 
sqlStatementContext.getSqlStatement() instanceof DALStatement) {
             List<ResultSet> resultSets = getResultSets();