This is an automated email from the ASF dual-hosted git repository.
zhaojinchao 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 4933b241f88 Remove useless param in ExecuteProcessEngine (#23696)
4933b241f88 is described below
commit 4933b241f882f2802069dad7708234c3efdd37a7
Author: Liang Zhang <[email protected]>
AuthorDate: Sat Jan 21 23:52:17 2023 +0800
Remove useless param in ExecuteProcessEngine (#23696)
---
.../executor/sql/process/ExecuteProcessEngine.java | 19 ++++++++-----------
.../frontend/netty/FrontendChannelInboundHandler.java | 3 +--
2 files changed, 9 insertions(+), 13 deletions(-)
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 206d87967cc..17ce3a7ee76 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
@@ -50,16 +50,14 @@ public final class ExecuteProcessEngine {
*
* @param grantee grantee
* @param databaseName database name
- * @param eventBusContext event bus context
* @return execution id
*/
- public static String initializeConnection(final Grantee grantee, final
String databaseName, final EventBusContext eventBusContext) {
+ public static String initializeConnection(final Grantee grantee, final
String databaseName) {
ExecutionGroupContext<SQLExecutionUnit> executionGroupContext = new
ExecutionGroupContext<>(Collections.emptyList());
executionGroupContext.setExecutionID(new
UUID(ThreadLocalRandom.current().nextLong(),
ThreadLocalRandom.current().nextLong()).toString().replace("-", ""));
executionGroupContext.setGrantee(grantee);
executionGroupContext.setDatabaseName(databaseName);
- Optional<ExecuteProcessReporter> reporter =
OptionalSPIRegistry.findRegisteredService(ExecuteProcessReporter.class);
- reporter.ifPresent(executeProcessReporter ->
executeProcessReporter.report(executionGroupContext));
+
OptionalSPIRegistry.findRegisteredService(ExecuteProcessReporter.class).ifPresent(optional
-> optional.report(executionGroupContext));
return executionGroupContext.getExecutionID();
}
@@ -69,8 +67,7 @@ public final class ExecuteProcessEngine {
* @param executionID execution id
*/
public static void finishConnection(final String executionID) {
- Optional<ExecuteProcessReporter> reporter =
OptionalSPIRegistry.findRegisteredService(ExecuteProcessReporter.class);
- reporter.ifPresent(executeProcessReporter ->
executeProcessReporter.reportRemove(executionID));
+
OptionalSPIRegistry.findRegisteredService(ExecuteProcessReporter.class).ifPresent(optional
-> optional.reportRemove(executionID));
}
/**
@@ -78,7 +75,7 @@ public final class ExecuteProcessEngine {
*
* @param queryContext query context
* @param executionGroupContext execution group context
- * @param eventBusContext event bus context
+ * @param eventBusContext event bus context
*/
public static void initializeExecution(final QueryContext queryContext,
final ExecutionGroupContext<? extends SQLExecutionUnit> executionGroupContext,
final EventBusContext eventBusContext) {
Optional<ExecuteProcessReporter> reporter =
OptionalSPIRegistry.findRegisteredService(ExecuteProcessReporter.class);
@@ -96,18 +93,18 @@ public final class ExecuteProcessEngine {
*
* @param executionID execution ID
* @param executionUnit execution unit
- * @param eventBusContext event bus context
+ * @param eventBusContext event bus context
*/
public static void finishExecution(final String executionID, final
SQLExecutionUnit executionUnit, final EventBusContext eventBusContext) {
- Optional<ExecuteProcessReporter> reporter =
OptionalSPIRegistry.findRegisteredService(ExecuteProcessReporter.class);
- reporter.ifPresent(executeProcessReporter ->
executeProcessReporter.report(executionID, executionUnit,
ExecuteProcessConstants.EXECUTE_STATUS_DONE, eventBusContext));
+ OptionalSPIRegistry.findRegisteredService(ExecuteProcessReporter.class)
+ .ifPresent(optional -> optional.report(executionID,
executionUnit, ExecuteProcessConstants.EXECUTE_STATUS_DONE, eventBusContext));
}
/**
* Finish execution.
*
* @param executionID execution ID
- * @param eventBusContext event bus context
+ * @param eventBusContext event bus context
*/
public static void finishExecution(final String executionID, final
EventBusContext eventBusContext) {
Optional<ExecuteProcessReporter> reporter =
OptionalSPIRegistry.findRegisteredService(ExecuteProcessReporter.class);
diff --git
a/proxy/frontend/core/src/main/java/org/apache/shardingsphere/proxy/frontend/netty/FrontendChannelInboundHandler.java
b/proxy/frontend/core/src/main/java/org/apache/shardingsphere/proxy/frontend/netty/FrontendChannelInboundHandler.java
index 7dcda7faf30..73e0820597d 100644
---
a/proxy/frontend/core/src/main/java/org/apache/shardingsphere/proxy/frontend/netty/FrontendChannelInboundHandler.java
+++
b/proxy/frontend/core/src/main/java/org/apache/shardingsphere/proxy/frontend/netty/FrontendChannelInboundHandler.java
@@ -79,8 +79,7 @@ public final class FrontendChannelInboundHandler extends
ChannelInboundHandlerAd
if (authResult.isFinished()) {
connectionSession.setGrantee(new
Grantee(authResult.getUsername(), authResult.getHostname()));
connectionSession.setCurrentDatabase(authResult.getDatabase());
-
connectionSession.setExecutionId(ExecuteProcessEngine.initializeConnection(connectionSession.getGrantee(),
connectionSession.getDatabaseName(),
-
ProxyContext.getInstance().getContextManager().getInstanceContext().getEventBusContext()));
+
connectionSession.setExecutionId(ExecuteProcessEngine.initializeConnection(connectionSession.getGrantee(),
connectionSession.getDatabaseName()));
}
return authResult.isFinished();
// CHECKSTYLE:OFF
