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 2024/06/04 17:46:52 UTC

(shardingsphere) branch master updated: Refactor DriverExecuteBatchExecutor (#31588)

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 f0e73b6cb4e Refactor DriverExecuteBatchExecutor (#31588)
f0e73b6cb4e is described below

commit f0e73b6cb4e2c4a2d3b0437d7da301280592f466
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Wed Jun 5 01:46:46 2024 +0800

    Refactor DriverExecuteBatchExecutor (#31588)
---
 .../shardingsphere/driver/executor/DriverExecuteBatchExecutor.java     | 3 +++
 .../driver/jdbc/core/statement/ShardingSpherePreparedStatement.java    | 3 ---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/jdbc/src/main/java/org/apache/shardingsphere/driver/executor/DriverExecuteBatchExecutor.java b/jdbc/src/main/java/org/apache/shardingsphere/driver/executor/DriverExecuteBatchExecutor.java
index 09d2356ee70..3d15c60b399 100644
--- a/jdbc/src/main/java/org/apache/shardingsphere/driver/executor/DriverExecuteBatchExecutor.java
+++ b/jdbc/src/main/java/org/apache/shardingsphere/driver/executor/DriverExecuteBatchExecutor.java
@@ -115,6 +115,9 @@ public final class DriverExecuteBatchExecutor {
                               final StatementOption statementOption, final DriverExecutionPrepareEngine<JDBCExecutionUnit, Connection> prepareEngine,
                               final ExecutionContext executionContext, final StatementAddCallback addCallback, final PreparedStatementParametersReplayCallback replayCallback,
                               final GeneratedKeyCallback generatedKeyCallback) throws SQLException {
+        if (null == executionContext) {
+            return new int[0];
+        }
         // TODO add raw SQL executor
         return doExecuteBatch(database, batchPreparedStatementExecutor,
                 sqlStatementContext, generatedValues, statementOption, prepareEngine, executionContext, addCallback, replayCallback, generatedKeyCallback);
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 dd2c338cf86..1e37f78eada 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
@@ -390,9 +390,6 @@ public final class ShardingSpherePreparedStatement extends AbstractPreparedState
     
     @Override
     public int[] executeBatch() throws SQLException {
-        if (null == executionContext) {
-            return new int[0];
-        }
         ShardingSphereDatabase database = metaData.getDatabase(databaseName);
         try {
             return driverExecutorFacade.getExecuteBatchExecutor().executeBatch(database, sqlStatementContext, generatedValues, statementOption,