(shardingsphere) branch master updated: Rename DriverExecutor.execute() (#31525)

[duanzhengqiang]

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

duanzhengqiang 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 cabee1c6c0e Rename DriverExecutor.execute() (#31525)
cabee1c6c0e is described below

commit cabee1c6c0e3b530f0a1ebce8f3db7d88b4ed8dd
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Sun Jun 2 13:41:01 2024 +0800

    Rename DriverExecutor.execute() (#31525)
---
 .../org/apache/shardingsphere/driver/executor/DriverExecutor.java | 8 ++++----
 .../jdbc/core/statement/ShardingSpherePreparedStatement.java      | 2 +-
 .../driver/jdbc/core/statement/ShardingSphereStatement.java       | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git 
a/jdbc/src/main/java/org/apache/shardingsphere/driver/executor/DriverExecutor.java
 
b/jdbc/src/main/java/org/apache/shardingsphere/driver/executor/DriverExecutor.java
index 42f7ebc8691..7d14befa9b1 100644
--- 
a/jdbc/src/main/java/org/apache/shardingsphere/driver/executor/DriverExecutor.java
+++ 
b/jdbc/src/main/java/org/apache/shardingsphere/driver/executor/DriverExecutor.java
@@ -354,7 +354,7 @@ public final class DriverExecutor implements AutoCloseable {
     }
     
     /**
-     * Execute advance.
+     * Execute.
      *
      * @param database database
      * @param queryContext query context
@@ -365,9 +365,9 @@ public final class DriverExecutor implements AutoCloseable {
      * @throws SQLException SQL exception
      */
     @SuppressWarnings("rawtypes")
-    public boolean executeAdvance(final ShardingSphereDatabase database, final 
QueryContext queryContext,
-                                  final 
DriverExecutionPrepareEngine<JDBCExecutionUnit, Connection> prepareEngine,
-                                  final ExecuteCallback executeCallback, final 
StatementReplayCallback statementReplayCallback) throws SQLException {
+    public boolean execute(final ShardingSphereDatabase database, final 
QueryContext queryContext,
+                           final 
DriverExecutionPrepareEngine<JDBCExecutionUnit, Connection> prepareEngine,
+                           final ExecuteCallback executeCallback, final 
StatementReplayCallback statementReplayCallback) throws SQLException {
         Optional<String> trafficInstanceId = 
connection.getTrafficInstanceId(metaData.getGlobalRuleMetaData().getSingleRule(TrafficRule.class),
 queryContext);
         if (trafficInstanceId.isPresent()) {
             executeType = ExecuteType.TRAFFIC;
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 2c7ccd7150d..e8d6cc46457 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
@@ -287,7 +287,7 @@ public final class ShardingSpherePreparedStatement extends 
AbstractPreparedState
             QueryContext queryContext = createQueryContext();
             
handleAutoCommit(queryContext.getSqlStatementContext().getSqlStatement());
             ShardingSphereDatabase database = 
metaData.getDatabase(databaseName);
-            final boolean result = executor.executeAdvance(database, 
queryContext, createDriverExecutionPrepareEngine(database), (sql, statement) -> 
((PreparedStatement) statement).execute(),
+            final boolean result = executor.execute(database, queryContext, 
createDriverExecutionPrepareEngine(database), (sql, statement) -> 
((PreparedStatement) statement).execute(),
                     (StatementReplayCallback<PreparedStatement>) this::replay);
             for (Statement each : executor.getStatements()) {
                 statements.add((PreparedStatement) each);
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 5249ff22f86..daa74f8e11d 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
@@ -266,7 +266,7 @@ public final class ShardingSphereStatement extends 
AbstractStatementAdapter {
         QueryContext queryContext = createQueryContext(sql);
         prepareExecute(queryContext);
         ShardingSphereDatabase database = metaData.getDatabase(databaseName);
-        boolean result = executor.executeAdvance(database, queryContext, 
createDriverExecutionPrepareEngine(database),
+        boolean result = executor.execute(database, queryContext, 
createDriverExecutionPrepareEngine(database),
                 executeCallback, (StatementReplayCallback<Statement>) 
(statements, parameterSets) -> replay(statements));
         statements.addAll(executor.getStatements());
         return result;