This is an automated email from the ASF dual-hosted git repository.
sunnianjun 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 21446f18d52 Keep same param sequence with ExecuteProcessEngine and
RawExecutor (#23708)
21446f18d52 is described below
commit 21446f18d526e3fd7ea5fd29aa06cd797e88c6cc
Author: Liang Zhang <[email protected]>
AuthorDate: Mon Jan 23 21:04:02 2023 +0800
Keep same param sequence with ExecuteProcessEngine and RawExecutor (#23708)
* Refactor QueryContext
* Keep same param sequence with ExecuteProcessEngine and RawExecutor
---
.../infra/executor/sql/execute/engine/raw/RawExecutor.java | 2 +-
.../infra/executor/sql/process/ExecuteProcessEngine.java | 4 ++--
.../apache/shardingsphere/driver/executor/DriverJDBCExecutor.java | 6 +++---
.../sqlfederation/executor/FilterableTableScanExecutor.java | 2 +-
.../sqlfederation/executor/TranslatableTableScanExecutor.java | 4 ++--
.../backend/communication/jdbc/executor/ProxyJDBCExecutor.java | 2 +-
6 files changed, 10 insertions(+), 10 deletions(-)
diff --git
a/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/engine/raw/RawExecutor.java
b/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/engine/raw/RawExecutor.java
index 865739df8be..84baf7b914e 100644
---
a/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/engine/raw/RawExecutor.java
+++
b/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/engine/raw/RawExecutor.java
@@ -59,7 +59,7 @@ public final class RawExecutor {
final QueryContext queryContext, final
RawSQLExecutorCallback callback) throws SQLException {
ExecuteProcessEngine executeProcessEngine = new ExecuteProcessEngine();
try {
- executeProcessEngine.initializeExecution(queryContext,
executionGroupContext);
+ executeProcessEngine.initializeExecution(executionGroupContext,
queryContext);
// TODO Load query header for first query
List<ExecuteResult> results = execute(executionGroupContext,
(RawSQLExecutorCallback) null, callback);
executeProcessEngine.finishExecution(executionGroupContext.getExecutionID(),
eventBusContext);
diff --git
a/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/process/ExecuteProcessEngine.java
b/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/process/ExecuteProcessEngine.java
index 3ea6ac43031..86b618de0b3 100644
---
a/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/process/ExecuteProcessEngine.java
+++
b/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/process/ExecuteProcessEngine.java
@@ -74,10 +74,10 @@ public final class ExecuteProcessEngine {
/**
* Initialize execution.
*
- * @param queryContext query context
* @param executionGroupContext execution group context
+ * @param queryContext query context
*/
- public void initializeExecution(final QueryContext queryContext, final
ExecutionGroupContext<? extends SQLExecutionUnit> executionGroupContext) {
+ public void initializeExecution(final ExecutionGroupContext<? extends
SQLExecutionUnit> executionGroupContext, final QueryContext queryContext) {
if (Strings.isNullOrEmpty(executionGroupContext.getExecutionID())) {
executionGroupContext.setExecutionID(new
UUID(ThreadLocalRandom.current().nextLong(),
ThreadLocalRandom.current().nextLong()).toString().replace("-", ""));
}
diff --git
a/jdbc/core/src/main/java/org/apache/shardingsphere/driver/executor/DriverJDBCExecutor.java
b/jdbc/core/src/main/java/org/apache/shardingsphere/driver/executor/DriverJDBCExecutor.java
index 0ec192c7c7b..8104d035c1b 100644
---
a/jdbc/core/src/main/java/org/apache/shardingsphere/driver/executor/DriverJDBCExecutor.java
+++
b/jdbc/core/src/main/java/org/apache/shardingsphere/driver/executor/DriverJDBCExecutor.java
@@ -75,7 +75,7 @@ public final class DriverJDBCExecutor {
final QueryContext queryContext,
final ExecuteQueryCallback callback) throws SQLException {
ExecuteProcessEngine executeProcessEngine = new ExecuteProcessEngine();
try {
- executeProcessEngine.initializeExecution(queryContext,
executionGroupContext);
+ executeProcessEngine.initializeExecution(executionGroupContext,
queryContext);
List<QueryResult> result =
jdbcExecutor.execute(executionGroupContext, callback);
executeProcessEngine.finishExecution(executionGroupContext.getExecutionID(),
eventBusContext);
return result;
@@ -98,7 +98,7 @@ public final class DriverJDBCExecutor {
final QueryContext queryContext, final
Collection<RouteUnit> routeUnits, final JDBCExecutorCallback<Integer> callback)
throws SQLException {
ExecuteProcessEngine executeProcessEngine = new ExecuteProcessEngine();
try {
- executeProcessEngine.initializeExecution(queryContext,
executionGroupContext);
+ executeProcessEngine.initializeExecution(executionGroupContext,
queryContext);
SQLStatementContext<?> sqlStatementContext =
queryContext.getSqlStatementContext();
List<Integer> results = doExecute(executionGroupContext,
sqlStatementContext, routeUnits, callback);
int result =
isNeedAccumulate(metaDataContexts.getMetaData().getDatabase(databaseName).getRuleMetaData().getRules(),
sqlStatementContext) ? accumulate(results) : results.get(0);
@@ -140,7 +140,7 @@ public final class DriverJDBCExecutor {
final Collection<RouteUnit> routeUnits, final
JDBCExecutorCallback<Boolean> callback) throws SQLException {
ExecuteProcessEngine executeProcessEngine = new ExecuteProcessEngine();
try {
- executeProcessEngine.initializeExecution(queryContext,
executionGroupContext);
+ executeProcessEngine.initializeExecution(executionGroupContext,
queryContext);
List<Boolean> results = doExecute(executionGroupContext,
queryContext.getSqlStatementContext(), routeUnits, callback);
boolean result = null != results && !results.isEmpty() && null !=
results.get(0) && results.get(0);
executeProcessEngine.finishExecution(executionGroupContext.getExecutionID(),
eventBusContext);
diff --git
a/kernel/sql-federation/executor/core/src/main/java/org/apache/shardingsphere/sqlfederation/executor/FilterableTableScanExecutor.java
b/kernel/sql-federation/executor/core/src/main/java/org/apache/shardingsphere/sqlfederation/executor/FilterableTableScanExecutor.java
index 8f24fa019b4..84ce5fea378 100644
---
a/kernel/sql-federation/executor/core/src/main/java/org/apache/shardingsphere/sqlfederation/executor/FilterableTableScanExecutor.java
+++
b/kernel/sql-federation/executor/core/src/main/java/org/apache/shardingsphere/sqlfederation/executor/FilterableTableScanExecutor.java
@@ -154,7 +154,7 @@ public final class FilterableTableScanExecutor implements
TableScanExecutor {
try {
ExecutionGroupContext<JDBCExecutionUnit> executionGroupContext =
prepareEngine.prepare(context.getRouteContext(), context.getExecutionUnits());
setParameters(executionGroupContext.getInputGroups());
-
executeProcessEngine.initializeExecution(context.getQueryContext(),
executionGroupContext);
+ executeProcessEngine.initializeExecution(executionGroupContext,
context.getQueryContext());
List<QueryResult> queryResults = execute(executionGroupContext,
databaseType);
executeProcessEngine.finishExecution(executionGroupContext.getExecutionID(),
eventBusContext);
// TODO need to get session context
diff --git
a/kernel/sql-federation/executor/core/src/main/java/org/apache/shardingsphere/sqlfederation/executor/TranslatableTableScanExecutor.java
b/kernel/sql-federation/executor/core/src/main/java/org/apache/shardingsphere/sqlfederation/executor/TranslatableTableScanExecutor.java
index 3eea1e5cf39..191221306eb 100644
---
a/kernel/sql-federation/executor/core/src/main/java/org/apache/shardingsphere/sqlfederation/executor/TranslatableTableScanExecutor.java
+++
b/kernel/sql-federation/executor/core/src/main/java/org/apache/shardingsphere/sqlfederation/executor/TranslatableTableScanExecutor.java
@@ -181,7 +181,7 @@ public final class TranslatableTableScanExecutor implements
TableScanExecutor {
try {
ExecutionGroupContext<JDBCExecutionUnit> executionGroupContext =
prepareEngine.prepare(context.getRouteContext(), context.getExecutionUnits());
setParameters(executionGroupContext.getInputGroups());
-
executeProcessEngine.initializeExecution(context.getQueryContext(),
executionGroupContext);
+ executeProcessEngine.initializeExecution(executionGroupContext,
context.getQueryContext());
List<QueryResult> queryResults = execute(executionGroupContext,
databaseType);
executeProcessEngine.finishExecution(executionGroupContext.getExecutionID(),
eventBusContext);
MergeEngine mergeEngine = new MergeEngine(database,
executorContext.getProps(), new ConnectionContext());
@@ -242,7 +242,7 @@ public final class TranslatableTableScanExecutor implements
TableScanExecutor {
try {
ExecutionGroupContext<JDBCExecutionUnit> executionGroupContext =
prepareEngine.prepare(context.getRouteContext(), context.getExecutionUnits());
setParameters(executionGroupContext.getInputGroups());
-
executeProcessEngine.initializeExecution(context.getQueryContext(),
executionGroupContext);
+ executeProcessEngine.initializeExecution(executionGroupContext,
context.getQueryContext());
List<QueryResult> queryResults = execute(executionGroupContext,
databaseType);
executeProcessEngine.finishExecution(executionGroupContext.getExecutionID(),
eventBusContext);
MergeEngine mergeEngine = new MergeEngine(database,
executorContext.getProps(), new ConnectionContext());
diff --git
a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/executor/ProxyJDBCExecutor.java
b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/executor/ProxyJDBCExecutor.java
index 9be88478fc1..cca1b8bf448 100644
---
a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/executor/ProxyJDBCExecutor.java
+++
b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/executor/ProxyJDBCExecutor.java
@@ -71,7 +71,7 @@ public final class ProxyJDBCExecutor {
ShardingSphereDatabase database =
metaDataContexts.getMetaData().getDatabase(connectionSession.getDatabaseName());
DatabaseType protocolType = database.getProtocolType();
Map<String, DatabaseType> storageTypes =
database.getResourceMetaData().getStorageTypes();
- executeProcessEngine.initializeExecution(queryContext,
executionGroupContext);
+ executeProcessEngine.initializeExecution(executionGroupContext,
queryContext);
SQLStatementContext<?> context =
queryContext.getSqlStatementContext();
List<ExecuteResult> result =
jdbcExecutor.execute(executionGroupContext,
ProxyJDBCExecutorCallbackFactory.newInstance(type,
protocolType, storageTypes, context.getSqlStatement(),
databaseCommunicationEngine, isReturnGeneratedKeys, isExceptionThrown,
