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 f0d8ad9652f Remove useless param in
ExecuteProcessEngine.initializeExecution() (#23705)
f0d8ad9652f is described below
commit f0d8ad9652fe7b4c921c441033d2375b01819508
Author: Liang Zhang <[email protected]>
AuthorDate: Sun Jan 22 17:41:39 2023 +0800
Remove useless param in ExecuteProcessEngine.initializeExecution() (#23705)
---
.../infra/executor/sql/execute/engine/raw/RawExecutor.java | 2 +-
.../infra/executor/sql/process/ExecuteProcessEngine.java | 3 +--
.../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, 9 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 fb024c6d7e5..0f070bbfc51 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
@@ -62,7 +62,7 @@ public final class RawExecutor {
final RawSQLExecutorCallback callback)
throws SQLException {
ExecuteProcessEngine executeProcessEngine = new ExecuteProcessEngine();
try {
- executeProcessEngine.initializeExecution(queryContext,
executionGroupContext, eventBusContext);
+ executeProcessEngine.initializeExecution(queryContext,
executionGroupContext);
// 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 a0aa5ea2277..3ea6ac43031 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
@@ -76,9 +76,8 @@ public final class ExecuteProcessEngine {
*
* @param queryContext query context
* @param executionGroupContext execution group context
- * @param eventBusContext event bus context
*/
- public void initializeExecution(final QueryContext queryContext, final
ExecutionGroupContext<? extends SQLExecutionUnit> executionGroupContext, final
EventBusContext eventBusContext) {
+ public void initializeExecution(final QueryContext queryContext, final
ExecutionGroupContext<? extends SQLExecutionUnit> executionGroupContext) {
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 d84cd871f39..0ec192c7c7b 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, eventBusContext);
+ executeProcessEngine.initializeExecution(queryContext,
executionGroupContext);
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, eventBusContext);
+ executeProcessEngine.initializeExecution(queryContext,
executionGroupContext);
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, eventBusContext);
+ executeProcessEngine.initializeExecution(queryContext,
executionGroupContext);
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 40b525bfe97..8f24fa019b4 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, eventBusContext);
+
executeProcessEngine.initializeExecution(context.getQueryContext(),
executionGroupContext);
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 86376bb0d0a..3eea1e5cf39 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, eventBusContext);
+
executeProcessEngine.initializeExecution(context.getQueryContext(),
executionGroupContext);
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, eventBusContext);
+
executeProcessEngine.initializeExecution(context.getQueryContext(),
executionGroupContext);
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 7a75c6a5ffe..9be88478fc1 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, eventBusContext);
+ executeProcessEngine.initializeExecution(queryContext,
executionGroupContext);
SQLStatementContext<?> context =
queryContext.getSqlStatementContext();
List<ExecuteResult> result =
jdbcExecutor.execute(executionGroupContext,
ProxyJDBCExecutorCallbackFactory.newInstance(type,
protocolType, storageTypes, context.getSqlStatement(),
databaseCommunicationEngine, isReturnGeneratedKeys, isExceptionThrown,
