Move execute to DriverExecutor

apache · May 31, 2024 · 525e0f0 · 525e0f0
1 parent 86e8c59
commit 525e0f0
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 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
@@ -365,14 +365,15 @@ private int accumulate(final Collection<ExecuteResult> results) {
      * @param isNeedImplicitCommitTransaction is need implicit commit transaction
      * @param executeCallback execute callback
      * @param statementReplayCallback statement replay callback
+     * @param executionContext execution context
      * @return execute result
      * @throws SQLException SQL exception
      */
     @SuppressWarnings("rawtypes")
     public boolean executeAdvance(final ShardingSphereMetaData metaData, final ShardingSphereDatabase database,
-                                            final QueryContext queryContext, final DriverExecutionPrepareEngine<JDBCExecutionUnit, Connection> prepareEngine,
-                                            final TrafficExecutorCallback<Boolean> trafficCallback, final boolean isNeedImplicitCommitTransaction,
-                                            final ExecuteCallback executeCallback, final StatementReplayCallback statementReplayCallback) throws SQLException {
+                                  final QueryContext queryContext, final DriverExecutionPrepareEngine<JDBCExecutionUnit, Connection> prepareEngine,
+                                  final TrafficExecutorCallback<Boolean> trafficCallback, final boolean isNeedImplicitCommitTransaction,
+                                  final ExecuteCallback executeCallback, final StatementReplayCallback statementReplayCallback, final ExecutionContext executionContext) throws SQLException {
         Optional<String> trafficInstanceId = connection.getTrafficInstanceId(metaData.getGlobalRuleMetaData().getSingleRule(TrafficRule.class), queryContext);
         if (trafficInstanceId.isPresent()) {
             executeType = ExecuteType.TRAFFIC;
@@ -384,7 +385,6 @@ public boolean executeAdvance(final ShardingSphereMetaData metaData, final Shard
                     prepareEngine, getExecuteQueryCallback(database, queryContext, prepareEngine.getType()), new SQLFederationContext(false, queryContext, metaData, connection.getProcessId()));
             return null != resultSet;
         }
-        ExecutionContext executionContext = createExecutionContext(metaData, database, queryContext);
         if (!database.getRuleMetaData().getAttributes(RawExecutionRuleAttribute.class).isEmpty()) {
             Collection<ExecuteResult> results = rawExecutor.execute(createRawExecutionGroupContext(metaData, database, executionContext), queryContext, new RawSQLExecutorCallback());
             return results.iterator().next() instanceof QueryResult;
@@ -398,7 +398,7 @@ private boolean executeWithExecutionContext(final ShardingSphereDatabase databas
                                                 final boolean isNeedImplicitCommitTransaction, final StatementReplayCallback statementReplayCallback) throws SQLException {
         return isNeedImplicitCommitTransaction
                 ? executeWithImplicitCommitTransaction(() -> useDriverToExecute(database, executeCallback, executionContext, prepareEngine, statementReplayCallback), connection,
-                database.getProtocolType())
+                        database.getProtocolType())
                 : useDriverToExecute(database, executeCallback, executionContext, prepareEngine, statementReplayCallback);
     }
 

diff --git a/...org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSpherePreparedStatement.java b/...org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSpherePreparedStatement.java
@@ -294,7 +294,7 @@ public boolean execute() throws SQLException {
             boolean isNeedImplicitCommitTransaction = isNeedImplicitCommitTransaction(connection, sqlStatementContext.getSqlStatement(), executionContext.getExecutionUnits().size() > 1);
             boolean result = executor.executeAdvance(
                     metaDataContexts.getMetaData(), database, queryContext, createDriverExecutionPrepareEngine(database), (statement, sql) -> ((PreparedStatement) statement).execute(),
-                    isNeedImplicitCommitTransaction, null, (StatementReplayCallback<PreparedStatement>) this::replay);
+                    isNeedImplicitCommitTransaction, null, (StatementReplayCallback<PreparedStatement>) this::replay, 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
@@ -298,7 +298,7 @@ private boolean execute0(final String sql, final ExecuteCallback executeCallback
         ExecutionContext executionContext = createExecutionContext(queryContext);
         boolean isNeedImplicitCommitTransaction = isNeedImplicitCommitTransaction(connection, sqlStatementContext.getSqlStatement(), executionContext.getExecutionUnits().size() > 1);
         boolean result = executor.executeAdvance(metaDataContexts.getMetaData(), database, queryContext, createDriverExecutionPrepareEngine(database), trafficCallback,
-                isNeedImplicitCommitTransaction, executeCallback, (StatementReplayCallback<Statement>) (statements, parameterSets) -> replay(statements));
+                isNeedImplicitCommitTransaction, executeCallback, (StatementReplayCallback<Statement>) (statements, parameterSets) -> replay(statements), executionContext);
         statements.addAll(executor.getStatements());
         return result;
     }