Rename DriverExecutor.executeUpdate() (#31453)

apache · May 31, 2024 · d4035fc · d4035fc
1 parent 1118bcd
commit d4035fc
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 16 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
@@ -251,7 +251,7 @@ private List<ResultSet> getResultSets() throws SQLException {
     }
 
     /**
-     * Execute advance update.
+     * Execute update.
      *
      * @param metaData meta data
      * @param database database
@@ -266,10 +266,10 @@ private List<ResultSet> getResultSets() throws SQLException {
      * @throws SQLException SQL exception
      */
     @SuppressWarnings("rawtypes")
-    public int executeAdvanceUpdate(final ShardingSphereMetaData metaData, final ShardingSphereDatabase database, final QueryContext queryContext,
-                                    final DriverExecutionPrepareEngine<JDBCExecutionUnit, Connection> prepareEngine, final TrafficExecutorCallback<Integer> trafficCallback,
-                                    final ExecuteUpdateCallback updateCallback, final boolean isNeedImplicitCommitTransaction,
-                                    final StatementReplayCallback statementReplayCallback, final ExecutionContext executionContext) throws SQLException {
+    public int executeUpdate(final ShardingSphereMetaData metaData, final ShardingSphereDatabase database, final QueryContext queryContext,
+                             final DriverExecutionPrepareEngine<JDBCExecutionUnit, Connection> prepareEngine,
+                             final TrafficExecutorCallback<Integer> trafficCallback, final ExecuteUpdateCallback updateCallback, final StatementReplayCallback statementReplayCallback,
+                             final boolean isNeedImplicitCommitTransaction, final ExecutionContext executionContext) throws SQLException {
         Optional<String> trafficInstanceId = connection.getTrafficInstanceId(metaData.getGlobalRuleMetaData().getSingleRule(TrafficRule.class), queryContext);
         if (trafficInstanceId.isPresent()) {
             return trafficExecutor.execute(connection.getProcessId(), database.getName(), trafficInstanceId.get(), queryContext, prepareEngine, trafficCallback);

diff --git a/...org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSpherePreparedStatement.java b/...org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSpherePreparedStatement.java
@@ -278,9 +278,9 @@ public int executeUpdate() throws SQLException {
             ShardingSphereDatabase database = metaDataContexts.getMetaData().getDatabase(databaseName);
             ExecutionContext executionContext = createExecutionContext(queryContext);
             boolean isNeedImplicitCommitTransaction = isNeedImplicitCommitTransaction(connection, sqlStatementContext.getSqlStatement(), executionContext.getExecutionUnits().size() > 1);
-            final int result = executor.executeAdvanceUpdate(metaDataContexts.getMetaData(), database, queryContext, createDriverExecutionPrepareEngine(database),
-                    (statement, sql) -> ((PreparedStatement) statement).executeUpdate(), null, isNeedImplicitCommitTransaction, (StatementReplayCallback<PreparedStatement>) this::replay,
-                    executionContext);
+            int result = executor.executeUpdate(metaDataContexts.getMetaData(), database, queryContext, createDriverExecutionPrepareEngine(database),
+                    (statement, sql) -> ((PreparedStatement) statement).executeUpdate(), null, (StatementReplayCallback<PreparedStatement>) this::replay,
+                    isNeedImplicitCommitTransaction, executionContext);
             for (Statement each : executor.getStatements()) {
                 statements.add((PreparedStatement) each);
             }

diff --git a/...in/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSphereStatement.java b/...in/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSphereStatement.java
@@ -172,7 +172,7 @@ private DriverExecutionPrepareEngine<JDBCExecutionUnit, Connection> createDriver
     @Override
     public int executeUpdate(final String sql) throws SQLException {
         try {
-            return executeUpdate0(sql, (actualSQL, statement) -> statement.executeUpdate(actualSQL), Statement::executeUpdate);
+            return executeUpdate(sql, (actualSQL, statement) -> statement.executeUpdate(actualSQL), Statement::executeUpdate);
             // CHECKSTYLE:OFF
         } catch (final RuntimeException ex) {
             // CHECKSTYLE:ON
@@ -189,7 +189,7 @@ public int executeUpdate(final String sql, final int autoGeneratedKeys) throws S
             returnGeneratedKeys = true;
         }
         try {
-            return executeUpdate0(sql, (actualSQL, statement) -> statement.executeUpdate(actualSQL, autoGeneratedKeys),
+            return executeUpdate(sql, (actualSQL, statement) -> statement.executeUpdate(actualSQL, autoGeneratedKeys),
                     (statement, actualSQL) -> statement.executeUpdate(actualSQL, autoGeneratedKeys));
             // CHECKSTYLE:OFF
         } catch (final RuntimeException ex) {
@@ -205,7 +205,7 @@ public int executeUpdate(final String sql, final int autoGeneratedKeys) throws S
     public int executeUpdate(final String sql, final int[] columnIndexes) throws SQLException {
         returnGeneratedKeys = true;
         try {
-            return executeUpdate0(sql, (actualSQL, statement) -> statement.executeUpdate(actualSQL, columnIndexes), (statement, actualSQL) -> statement.executeUpdate(actualSQL, columnIndexes));
+            return executeUpdate(sql, (actualSQL, statement) -> statement.executeUpdate(actualSQL, columnIndexes), (statement, actualSQL) -> statement.executeUpdate(actualSQL, columnIndexes));
             // CHECKSTYLE:OFF
         } catch (final RuntimeException ex) {
             // CHECKSTYLE:ON
@@ -220,7 +220,7 @@ public int executeUpdate(final String sql, final int[] columnIndexes) throws SQL
     public int executeUpdate(final String sql, final String[] columnNames) throws SQLException {
         returnGeneratedKeys = true;
         try {
-            return executeUpdate0(sql, (actualSQL, statement) -> statement.executeUpdate(actualSQL, columnNames), (statement, actualSQL) -> statement.executeUpdate(actualSQL, columnNames));
+            return executeUpdate(sql, (actualSQL, statement) -> statement.executeUpdate(actualSQL, columnNames), (statement, actualSQL) -> statement.executeUpdate(actualSQL, columnNames));
             // CHECKSTYLE:OFF
         } catch (final RuntimeException ex) {
             // CHECKSTYLE:ON
@@ -231,7 +231,7 @@ public int executeUpdate(final String sql, final String[] columnNames) throws SQ
         }
     }
 
-    private int executeUpdate0(final String sql, final ExecuteUpdateCallback updateCallback, final TrafficExecutorCallback<Integer> trafficCallback) throws SQLException {
+    private int executeUpdate(final String sql, final ExecuteUpdateCallback updateCallback, final TrafficExecutorCallback<Integer> trafficCallback) throws SQLException {
         QueryContext queryContext = createQueryContext(sql);
         handleAutoCommit(queryContext.getSqlStatementContext().getSqlStatement());
         databaseName = queryContext.getDatabaseNameFromSQLStatement().orElse(connection.getDatabaseName());
@@ -240,9 +240,9 @@ private int executeUpdate0(final String sql, final ExecuteUpdateCallback updateC
         sqlStatementContext = queryContext.getSqlStatementContext();
         ExecutionContext executionContext = createExecutionContext(queryContext);
         boolean isNeedImplicitCommitTransaction = isNeedImplicitCommitTransaction(connection, sqlStatementContext.getSqlStatement(), executionContext.getExecutionUnits().size() > 1);
-        int result = executor.executeAdvanceUpdate(
-                metaDataContexts.getMetaData(), database, queryContext, createDriverExecutionPrepareEngine(database), trafficCallback, updateCallback, isNeedImplicitCommitTransaction,
-                (StatementReplayCallback<Statement>) (statements, parameterSets) -> replay(statements), executionContext);
+        int result = executor.executeUpdate(
+                metaDataContexts.getMetaData(), database, queryContext, createDriverExecutionPrepareEngine(database), trafficCallback, updateCallback,
+                (StatementReplayCallback<Statement>) (statements, parameterSets) -> replay(statements), isNeedImplicitCommitTransaction, executionContext);
         statements.addAll(executor.getStatements());
         replay(statements);
         return result;