(shardingsphere) branch master updated: Refactor DriverExecuteExecutor (#32668)

[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 89f38a7367c Refactor DriverExecuteExecutor (#32668)
89f38a7367c is described below

commit 89f38a7367ccddca54d047ab883847cfc23f379e
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Sun Aug 25 12:18:47 2024 +0800

    Refactor DriverExecuteExecutor (#32668)
---
 .../driver/executor/engine/DriverExecuteExecutor.java             | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git 
a/jdbc/src/main/java/org/apache/shardingsphere/driver/executor/engine/DriverExecuteExecutor.java
 
b/jdbc/src/main/java/org/apache/shardingsphere/driver/executor/engine/DriverExecuteExecutor.java
index e35912b15a4..699b512d2db 100644
--- 
a/jdbc/src/main/java/org/apache/shardingsphere/driver/executor/engine/DriverExecuteExecutor.java
+++ 
b/jdbc/src/main/java/org/apache/shardingsphere/driver/executor/engine/DriverExecuteExecutor.java
@@ -100,7 +100,9 @@ public final class DriverExecuteExecutor {
             
metaDataRefreshEngine.refresh(queryContext.getSqlStatementContext());
             return true;
         }
-        return executePushDown(database, queryContext, prepareEngine, 
executeCallback, addCallback, replayCallback);
+        ExecutionContext executionContext =
+                new KernelProcessor().generateExecutionContext(queryContext, 
metaData.getGlobalRuleMetaData(), metaData.getProps(), 
connection.getDatabaseConnectionManager().getConnectionContext());
+        return executePushDown(database, executionContext, prepareEngine, 
executeCallback, addCallback, replayCallback);
     }
     
     private MetaDataRefreshEngine getMetaDataRefreshEngine(final 
ShardingSphereDatabase database) {
@@ -108,10 +110,8 @@ public final class DriverExecuteExecutor {
     }
     
     @SuppressWarnings("rawtypes")
-    private boolean executePushDown(final ShardingSphereDatabase database, 
final QueryContext queryContext, final 
DriverExecutionPrepareEngine<JDBCExecutionUnit, Connection> prepareEngine,
+    private boolean executePushDown(final ShardingSphereDatabase database, 
final ExecutionContext executionContext, final 
DriverExecutionPrepareEngine<JDBCExecutionUnit, Connection> prepareEngine,
                                     final StatementExecuteCallback 
executeCallback, final StatementAddCallback addCallback, final 
StatementReplayCallback replayCallback) throws SQLException {
-        ExecutionContext executionContext =
-                new KernelProcessor().generateExecutionContext(queryContext, 
metaData.getGlobalRuleMetaData(), metaData.getProps(), 
connection.getDatabaseConnectionManager().getConnectionContext());
         if 
(database.getRuleMetaData().getAttributes(RawExecutionRuleAttribute.class).isEmpty())
 {
             executeType = ExecuteType.JDBC_PUSH_DOWN;
             return jdbcPushDownExecutor.execute(database, executionContext, 
prepareEngine, executeCallback, addCallback, replayCallback);