This is an automated email from the ASF dual-hosted git repository.
totalo 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 86db529697f Rename ExecuteProcessEngine to ProcessEngine (#25410)
86db529697f is described below
commit 86db529697f0ee7ea1b7189d05887c52133ee101
Author: Liang Zhang <[email protected]>
AuthorDate: Sat Apr 29 11:56:20 2023 +0800
Rename ExecuteProcessEngine to ProcessEngine (#25410)
* Refactor ExecuteProcessUnit.isCompleted
* Refactor ExecuteProcessUnit
* Remove ExecuteProcessStatus
* Fix test case
* Fix test case
* Refactor ExecuteProcessContext
* Rename ExecuteProcessEngine to ProcessEngine
* Fix test case
---
...42\200\231s_Show_processlist_&_Kill_Work.en.md" | 6 ++--
.../engine/driver/jdbc/JDBCExecutorCallback.java | 4 +--
.../sql/execute/engine/raw/RawExecutor.java | 8 ++---
.../raw/callback/RawSQLExecutorCallback.java | 6 ++--
...xecuteProcessEngine.java => ProcessEngine.java} | 17 +++--------
...teProcessReporter.java => ProcessReporter.java} | 35 +++++++++++++---------
...terCleaner.java => ProcessReporterCleaner.java} | 8 ++---
.../sql/process/ShowProcessListManager.java | 10 +++----
...cuteProcessContext.java => ProcessContext.java} | 28 ++++++++---------
...ProcessContext.java => YamlProcessContext.java} | 4 +--
...sContexts.java => YamlProcessListContexts.java} | 6 ++--
...Swapper.java => YamlProcessContextSwapper.java} | 18 +++++------
...er.java => YamlProcessListContextsSwapper.java} | 20 ++++++-------
...sReporterTest.java => ProcessReporterTest.java} | 14 ++++-----
...java => YamlAllProcessContextsSwapperTest.java} | 18 +++++------
...est.java => YamlProcessContextSwapperTest.java} | 12 ++++----
.../driver/executor/DriverJDBCExecutor.java | 20 ++++++-------
...aner.java => DriverProcessReporterCleaner.java} | 10 +++----
...fra.executor.sql.process.ProcessReporterCleaner | 2 +-
.../executor/FilterableTableScanExecutor.java | 8 ++---
.../executor/TranslatableTableScanExecutor.java | 14 ++++-----
...stEvent.java => KillProcessIdRequestEvent.java} | 6 ++--
.../subscriber/ProcessRegistrySubscriber.java | 6 ++--
...essListIdEvent.java => KillProcessIdEvent.java} | 6 ++--
.../compute/event/ShowProcessListTriggerEvent.java | 2 +-
.../watcher/ComputeNodeStateChangedWatcher.java | 4 +--
.../subscriber/ProcessListChangedSubscriber.java | 24 +++++++--------
.../ProcessListChangedSubscriberTest.java | 8 ++---
.../subscriber/ProcessStandaloneSubscriber.java | 18 +++++------
.../connector/jdbc/executor/ProxyJDBCExecutor.java | 8 ++---
.../admin/executor/KillProcessExecutor.java | 4 +--
.../admin/executor/ShowProcessListExecutor.java | 30 +++++++++----------
...eaner.java => ProxyProcessReporterCleaner.java} | 8 ++---
...fra.executor.sql.process.ProcessReporterCleaner | 2 +-
.../netty/FrontendChannelInboundHandler.java | 6 ++--
.../statement/dal/impl/KillStatementAssert.java | 2 +-
.../jaxb/statement/dal/KillStatementTestCase.java | 4 +--
.../it/parser/src/main/resources/case/dal/kill.xml | 2 +-
.../src/main/resources/sql/supported/dal/kill.xml | 2 +-
39 files changed, 202 insertions(+), 208 deletions(-)
diff --git
"a/docs/blog/content/material/2022_09_22_How_does_ShardingSphere\342\200\231s_Show_processlist_&_Kill_Work.en.md"
"b/docs/blog/content/material/2022_09_22_How_does_ShardingSphere\342\200\231s_Show_processlist_&_Kill_Work.en.md"
index 88ffe874688..b96732fa25f 100644
---
"a/docs/blog/content/material/2022_09_22_How_does_ShardingSphere\342\200\231s_Show_processlist_&_Kill_Work.en.md"
+++
"b/docs/blog/content/material/2022_09_22_How_does_ShardingSphere\342\200\231s_Show_processlist_&_Kill_Work.en.md"
@@ -55,9 +55,9 @@ public final class GovernanceExecuteProcessReporter
implements ExecuteProcessRep
@Override
public void report(final QueryContext queryContext, final
ExecutionGroupContext<? extends SQLExecutionUnit> executionGroupContext,
final ExecuteProcessConstants constants, final
EventBusContext eventBusContext) {
- ExecuteProcessContext executeProcessContext = new
ExecuteProcessContext(queryContext.getSql(), executionGroupContext, constants);
-
ShowProcessListManager.getInstance().putProcessContext(executeProcessContext.getExecutionID(),
executeProcessContext);
-
ShowProcessListManager.getInstance().putProcessStatement(executeProcessContext.getExecutionID(),
executeProcessContext.getProcessStatements());
+ ExecuteProcessContext processContext = new
ExecuteProcessContext(queryContext.getSql(), executionGroupContext, constants);
+
ShowProcessListManager.getInstance().putProcessContext(processContext.getExecutionID(),
processContext);
+
ShowProcessListManager.getInstance().putProcessStatement(processContext.getExecutionID(),
processContext.getProcessStatements());
}
}@NoArgsConstructor(access = AccessLevel.PRIVATE)
public final class ShowProcessListManager {
diff --git
a/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/engine/driver/jdbc/JDBCExecutorCallback.java
b/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/engine/driver/jdbc/JDBCExecutorCallback.java
index 615ebfb9110..c8ca58a43e0 100644
---
a/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/engine/driver/jdbc/JDBCExecutorCallback.java
+++
b/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/engine/driver/jdbc/JDBCExecutorCallback.java
@@ -27,7 +27,7 @@ import
org.apache.shardingsphere.infra.executor.sql.execute.engine.SQLExecutionU
import
org.apache.shardingsphere.infra.executor.sql.execute.engine.SQLExecutorExceptionHandler;
import org.apache.shardingsphere.infra.executor.sql.hook.SPISQLExecutionHook;
import org.apache.shardingsphere.infra.executor.sql.hook.SQLExecutionHook;
-import
org.apache.shardingsphere.infra.executor.sql.process.ExecuteProcessEngine;
+import org.apache.shardingsphere.infra.executor.sql.process.ProcessEngine;
import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;
import java.sql.DatabaseMetaData;
@@ -111,7 +111,7 @@ public abstract class JDBCExecutorCallback<T> implements
ExecutorCallback<JDBCEx
}
private void finishReport(final SQLExecutionUnit executionUnit) {
- new ExecuteProcessEngine().finishExecution(executionUnit);
+ new ProcessEngine().finishExecution(executionUnit);
}
protected abstract T executeSQL(String sql, Statement statement,
ConnectionMode connectionMode, DatabaseType storageType) throws SQLException;
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 57e9454c29a..c0d002dc040 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
@@ -26,7 +26,7 @@ import
org.apache.shardingsphere.infra.executor.sql.execute.engine.SQLExecutorEx
import
org.apache.shardingsphere.infra.executor.sql.execute.engine.raw.callback.RawSQLExecutorCallback;
import
org.apache.shardingsphere.infra.executor.sql.execute.result.ExecuteResult;
import
org.apache.shardingsphere.infra.executor.sql.execute.result.update.UpdateResult;
-import
org.apache.shardingsphere.infra.executor.sql.process.ExecuteProcessEngine;
+import org.apache.shardingsphere.infra.executor.sql.process.ProcessEngine;
import java.sql.SQLException;
import java.util.Collections;
@@ -54,14 +54,14 @@ public final class RawExecutor {
*/
public List<ExecuteResult> execute(final
ExecutionGroupContext<RawSQLExecutionUnit> executionGroupContext,
final QueryContext queryContext, final
RawSQLExecutorCallback callback) throws SQLException {
- ExecuteProcessEngine executeProcessEngine = new ExecuteProcessEngine();
+ ProcessEngine processEngine = new ProcessEngine();
try {
- executeProcessEngine.initializeExecution(executionGroupContext,
queryContext);
+ processEngine.initializeExecution(executionGroupContext,
queryContext);
// TODO Load query header for first query
List<ExecuteResult> results = execute(executionGroupContext,
(RawSQLExecutorCallback) null, callback);
return results.isEmpty() || Objects.isNull(results.get(0)) ?
Collections.singletonList(new UpdateResult(0, 0L)) : results;
} finally {
- executeProcessEngine.cleanExecution();
+ processEngine.cleanExecution();
}
}
diff --git
a/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/engine/raw/callback/RawSQLExecutorCallback.java
b/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/engine/raw/callback/RawSQLExecutorCallback.java
index 9094b2c5edd..8c0868d516a 100644
---
a/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/engine/raw/callback/RawSQLExecutorCallback.java
+++
b/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/engine/raw/callback/RawSQLExecutorCallback.java
@@ -22,7 +22,7 @@ import
org.apache.shardingsphere.infra.executor.kernel.model.ExecutorCallback;
import
org.apache.shardingsphere.infra.executor.sql.execute.engine.raw.RawSQLExecutionUnit;
import
org.apache.shardingsphere.infra.executor.sql.execute.result.ExecuteResult;
import org.apache.shardingsphere.infra.executor.sql.process.ExecuteIDContext;
-import
org.apache.shardingsphere.infra.executor.sql.process.ExecuteProcessEngine;
+import org.apache.shardingsphere.infra.executor.sql.process.ProcessEngine;
import org.apache.shardingsphere.infra.util.spi.ShardingSphereServiceLoader;
import java.sql.SQLException;
@@ -46,9 +46,9 @@ public final class RawSQLExecutorCallback implements
ExecutorCallback<RawSQLExec
public Collection<ExecuteResult> execute(final
Collection<RawSQLExecutionUnit> inputs, final boolean isTrunkThread) throws
SQLException {
Collection<ExecuteResult> result =
callbacks.iterator().next().execute(inputs, isTrunkThread);
if (!ExecuteIDContext.isEmpty()) {
- ExecuteProcessEngine executeProcessEngine = new
ExecuteProcessEngine();
+ ProcessEngine processEngine = new ProcessEngine();
for (RawSQLExecutionUnit each : inputs) {
- executeProcessEngine.finishExecution(each);
+ processEngine.finishExecution(each);
}
}
return result;
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/ProcessEngine.java
similarity index 80%
rename from
infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/process/ExecuteProcessEngine.java
rename to
infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/process/ProcessEngine.java
index 98d77535058..9c5e1fea972 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/ProcessEngine.java
@@ -19,7 +19,6 @@ package org.apache.shardingsphere.infra.executor.sql.process;
import org.apache.shardingsphere.infra.binder.QueryContext;
import
org.apache.shardingsphere.infra.executor.kernel.model.ExecutionGroupContext;
-import
org.apache.shardingsphere.infra.executor.kernel.model.ExecutionGroupReportContext;
import
org.apache.shardingsphere.infra.executor.sql.execute.engine.SQLExecutionUnit;
import org.apache.shardingsphere.infra.metadata.user.Grantee;
import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;
@@ -27,14 +26,12 @@ import
org.apache.shardingsphere.sql.parser.sql.common.statement.ddl.DDLStatemen
import
org.apache.shardingsphere.sql.parser.sql.common.statement.dml.DMLStatement;
import
org.apache.shardingsphere.sql.parser.sql.dialect.statement.mysql.MySQLStatement;
-import java.util.Collections;
-
/**
- * Execute process engine.
+ * Process engine.
*/
-public final class ExecuteProcessEngine {
+public final class ProcessEngine {
- private final ExecuteProcessReporter reporter = new
ExecuteProcessReporter();
+ private final ProcessReporter reporter = new ProcessReporter();
/**
* Initialize connection.
@@ -44,13 +41,7 @@ public final class ExecuteProcessEngine {
* @return execution ID
*/
public String initializeConnection(final Grantee grantee, final String
databaseName) {
- ExecutionGroupContext<SQLExecutionUnit> executionGroupContext =
createExecutionGroupContext(grantee, databaseName);
- reporter.reportConnect(executionGroupContext);
- return executionGroupContext.getReportContext().getExecutionID();
- }
-
- private ExecutionGroupContext<SQLExecutionUnit>
createExecutionGroupContext(final Grantee grantee, final String databaseName) {
- return new ExecutionGroupContext<>(Collections.emptyList(), new
ExecutionGroupReportContext(databaseName, grantee));
+ return reporter.reportConnect(grantee, databaseName);
}
/**
diff --git
a/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/process/ExecuteProcessReporter.java
b/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/process/ProcessReporter.java
similarity index 63%
rename from
infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/process/ExecuteProcessReporter.java
rename to
infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/process/ProcessReporter.java
index c645dc5c796..cbb9b3fc0a0 100644
---
a/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/process/ExecuteProcessReporter.java
+++
b/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/process/ProcessReporter.java
@@ -19,26 +19,33 @@ package
org.apache.shardingsphere.infra.executor.sql.process;
import org.apache.shardingsphere.infra.binder.QueryContext;
import
org.apache.shardingsphere.infra.executor.kernel.model.ExecutionGroupContext;
+import
org.apache.shardingsphere.infra.executor.kernel.model.ExecutionGroupReportContext;
import
org.apache.shardingsphere.infra.executor.sql.execute.engine.SQLExecutionUnit;
-import
org.apache.shardingsphere.infra.executor.sql.process.model.ExecuteProcessContext;
+import
org.apache.shardingsphere.infra.executor.sql.process.model.ProcessContext;
import
org.apache.shardingsphere.infra.executor.sql.process.model.ExecuteProcessUnit;
+import org.apache.shardingsphere.infra.metadata.user.Grantee;
import org.apache.shardingsphere.infra.util.spi.ShardingSphereServiceLoader;
+import java.util.Collections;
import java.util.Optional;
/**
- * Execute process report.
+ * Process report.
*/
-public final class ExecuteProcessReporter {
+public final class ProcessReporter {
/**
* Report connect.
*
- * @param executionGroupContext execution group context
+ * @param grantee grantee
+ * @param databaseName databaseName
+ * @return execution ID
*/
- public void reportConnect(final ExecutionGroupContext<? extends
SQLExecutionUnit> executionGroupContext) {
- ExecuteProcessContext executeProcessContext = new
ExecuteProcessContext(executionGroupContext);
-
ShowProcessListManager.getInstance().putProcessContext(executeProcessContext.getExecutionID(),
executeProcessContext);
+ public String reportConnect(final Grantee grantee, final String
databaseName) {
+ ExecutionGroupContext<? extends SQLExecutionUnit>
executionGroupContext = new ExecutionGroupContext<>(Collections.emptyList(),
new ExecutionGroupReportContext(databaseName, grantee));
+ ProcessContext processContext = new
ProcessContext(executionGroupContext);
+
ShowProcessListManager.getInstance().putProcessContext(processContext.getProcessID(),
processContext);
+ return executionGroupContext.getReportContext().getExecutionID();
}
/**
@@ -48,9 +55,9 @@ public final class ExecuteProcessReporter {
* @param executionGroupContext execution group context
*/
public void reportExecute(final QueryContext queryContext, final
ExecutionGroupContext<? extends SQLExecutionUnit> executionGroupContext) {
- ExecuteProcessContext executeProcessContext = new
ExecuteProcessContext(queryContext.getSql(), executionGroupContext);
-
ShowProcessListManager.getInstance().putProcessContext(executeProcessContext.getExecutionID(),
executeProcessContext);
-
ShowProcessListManager.getInstance().putProcessStatement(executeProcessContext.getExecutionID(),
executeProcessContext.getProcessStatements());
+ ProcessContext processContext = new
ProcessContext(queryContext.getSql(), executionGroupContext);
+
ShowProcessListManager.getInstance().putProcessContext(processContext.getProcessID(),
processContext);
+
ShowProcessListManager.getInstance().putProcessStatement(processContext.getProcessID(),
processContext.getProcessStatements());
}
/**
@@ -61,8 +68,8 @@ public final class ExecuteProcessReporter {
*/
public void reportComplete(final String executionID, final
SQLExecutionUnit executionUnit) {
ExecuteProcessUnit executeProcessUnit = new
ExecuteProcessUnit(executionUnit.getExecutionUnit());
- ExecuteProcessContext executeProcessContext =
ShowProcessListManager.getInstance().getProcessContext(executionID);
-
Optional.ofNullable(executeProcessContext.getProcessUnits().get(executeProcessUnit.getUnitID())).ifPresent(ExecuteProcessUnit::switchComplete);
+ ProcessContext processContext =
ShowProcessListManager.getInstance().getProcessContext(executionID);
+
Optional.ofNullable(processContext.getProcessUnits().get(executeProcessUnit.getUnitID())).ifPresent(ExecuteProcessUnit::switchComplete);
}
/**
@@ -72,11 +79,11 @@ public final class ExecuteProcessReporter {
*/
public void reset(final String executionID) {
ShowProcessListManager.getInstance().removeProcessStatement(executionID);
- ExecuteProcessContext context =
ShowProcessListManager.getInstance().getProcessContext(executionID);
+ ProcessContext context =
ShowProcessListManager.getInstance().getProcessContext(executionID);
if (null == context) {
return;
}
- for (ExecuteProcessReporterCleaner each :
ShardingSphereServiceLoader.getServiceInstances(ExecuteProcessReporterCleaner.class))
{
+ for (ProcessReporterCleaner each :
ShardingSphereServiceLoader.getServiceInstances(ProcessReporterCleaner.class)) {
each.reset(context);
}
}
diff --git
a/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/process/ExecuteProcessReporterCleaner.java
b/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/process/ProcessReporterCleaner.java
similarity index 87%
rename from
infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/process/ExecuteProcessReporterCleaner.java
rename to
infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/process/ProcessReporterCleaner.java
index 19ae387e5e4..d9606435c00 100644
---
a/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/process/ExecuteProcessReporterCleaner.java
+++
b/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/process/ProcessReporterCleaner.java
@@ -17,19 +17,19 @@
package org.apache.shardingsphere.infra.executor.sql.process;
-import
org.apache.shardingsphere.infra.executor.sql.process.model.ExecuteProcessContext;
+import
org.apache.shardingsphere.infra.executor.sql.process.model.ProcessContext;
import org.apache.shardingsphere.infra.util.spi.annotation.SingletonSPI;
/**
- * Execute process reporter cleaner.
+ * Process reporter cleaner.
*/
@SingletonSPI
-public interface ExecuteProcessReporterCleaner {
+public interface ProcessReporterCleaner {
/**
* Reset reporter.
*
* @param context execute process context
*/
- void reset(ExecuteProcessContext context);
+ void reset(ProcessContext context);
}
diff --git
a/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/process/ShowProcessListManager.java
b/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/process/ShowProcessListManager.java
index 7587e4d24d9..30dbc564d12 100644
---
a/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/process/ShowProcessListManager.java
+++
b/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/process/ShowProcessListManager.java
@@ -21,7 +21,7 @@ import lombok.AccessLevel;
import lombok.Getter;
import lombok.NoArgsConstructor;
import
org.apache.shardingsphere.infra.executor.sql.process.lock.ShowProcessListSimpleLock;
-import
org.apache.shardingsphere.infra.executor.sql.process.model.ExecuteProcessContext;
+import
org.apache.shardingsphere.infra.executor.sql.process.model.ProcessContext;
import java.sql.Statement;
import java.util.Collection;
@@ -38,7 +38,7 @@ public final class ShowProcessListManager {
private static final ShowProcessListManager INSTANCE = new
ShowProcessListManager();
@Getter
- private final Map<String, ExecuteProcessContext> processContexts = new
ConcurrentHashMap<>();
+ private final Map<String, ProcessContext> processContexts = new
ConcurrentHashMap<>();
@Getter
private final Map<String, Collection<Statement>> processStatements = new
ConcurrentHashMap<>();
@@ -61,7 +61,7 @@ public final class ShowProcessListManager {
* @param executionId execution id
* @param processContext process context
*/
- public void putProcessContext(final String executionId, final
ExecuteProcessContext processContext) {
+ public void putProcessContext(final String executionId, final
ProcessContext processContext) {
processContexts.put(executionId, processContext);
}
@@ -84,7 +84,7 @@ public final class ShowProcessListManager {
* @param executionId execution id
* @return execute process context
*/
- public ExecuteProcessContext getProcessContext(final String executionId) {
+ public ProcessContext getProcessContext(final String executionId) {
return processContexts.get(executionId);
}
@@ -121,7 +121,7 @@ public final class ShowProcessListManager {
*
* @return collection execute process context
*/
- public Collection<ExecuteProcessContext> getAllProcessContext() {
+ public Collection<ProcessContext> getAllProcessContext() {
return processContexts.values();
}
}
diff --git
a/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/process/model/ExecuteProcessContext.java
b/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/process/model/ProcessContext.java
similarity index 76%
rename from
infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/process/model/ExecuteProcessContext.java
rename to
infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/process/model/ProcessContext.java
index 44dc7d65d09..b1e19756e36 100644
---
a/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/process/model/ExecuteProcessContext.java
+++
b/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/process/model/ProcessContext.java
@@ -31,12 +31,12 @@ import java.util.LinkedList;
import java.util.Map;
/**
- * Execute process context.
+ * Process context.
*/
@Getter
-public final class ExecuteProcessContext {
+public final class ProcessContext {
- private final String executionID;
+ private final String processID;
private final String databaseName;
@@ -54,27 +54,23 @@ public final class ExecuteProcessContext {
private volatile boolean executing;
- public ExecuteProcessContext(final ExecutionGroupContext<? extends
SQLExecutionUnit> executionGroupContext) {
- executionID =
executionGroupContext.getReportContext().getExecutionID();
- databaseName =
executionGroupContext.getReportContext().getDatabaseName();
- Grantee grantee =
executionGroupContext.getReportContext().getGrantee();
- username = null == grantee ? null : grantee.getUsername();
- hostname = null == grantee ? null : grantee.getHostname();
- sql = "";
- startMillis = System.currentTimeMillis();
- executing = false;
- addProcessUnitsAndStatements(executionGroupContext);
+ public ProcessContext(final ExecutionGroupContext<? extends
SQLExecutionUnit> executionGroupContext) {
+ this("", executionGroupContext, false);
+ }
+
+ public ProcessContext(final String sql, final ExecutionGroupContext<?
extends SQLExecutionUnit> executionGroupContext) {
+ this(sql, executionGroupContext, true);
}
- public ExecuteProcessContext(final String sql, final
ExecutionGroupContext<? extends SQLExecutionUnit> executionGroupContext) {
- executionID =
executionGroupContext.getReportContext().getExecutionID();
+ private ProcessContext(final String sql, final ExecutionGroupContext<?
extends SQLExecutionUnit> executionGroupContext, final boolean executing) {
+ processID = executionGroupContext.getReportContext().getExecutionID();
databaseName =
executionGroupContext.getReportContext().getDatabaseName();
Grantee grantee =
executionGroupContext.getReportContext().getGrantee();
username = null == grantee ? null : grantee.getUsername();
hostname = null == grantee ? null : grantee.getHostname();
this.sql = sql;
startMillis = System.currentTimeMillis();
- executing = true;
+ this.executing = executing;
addProcessUnitsAndStatements(executionGroupContext);
}
diff --git
a/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/process/yaml/YamlExecuteProcessContext.java
b/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/process/yaml/YamlProcessContext.java
similarity index 92%
rename from
infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/process/yaml/YamlExecuteProcessContext.java
rename to
infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/process/yaml/YamlProcessContext.java
index ef771f239d2..3cf4c82848e 100644
---
a/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/process/yaml/YamlExecuteProcessContext.java
+++
b/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/process/yaml/YamlProcessContext.java
@@ -22,11 +22,11 @@ import lombok.Setter;
import org.apache.shardingsphere.infra.util.yaml.YamlConfiguration;
/**
- * Execute process context for YAML.
+ * Process context for YAML.
*/
@Getter
@Setter
-public final class YamlExecuteProcessContext implements YamlConfiguration {
+public final class YamlProcessContext implements YamlConfiguration {
private String executionID;
diff --git
a/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/process/yaml/YamlAllExecuteProcessContexts.java
b/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/process/yaml/YamlProcessListContexts.java
similarity index 84%
rename from
infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/process/yaml/YamlAllExecuteProcessContexts.java
rename to
infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/process/yaml/YamlProcessListContexts.java
index 17c3688c5ec..a5cd7374d0c 100644
---
a/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/process/yaml/YamlAllExecuteProcessContexts.java
+++
b/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/process/yaml/YamlProcessListContexts.java
@@ -25,11 +25,11 @@ import java.util.Collection;
import java.util.LinkedList;
/**
- * All execute process contexts for YAML.
+ * Process list contexts for YAML.
*/
@Getter
@Setter
-public final class YamlAllExecuteProcessContexts implements YamlConfiguration {
+public final class YamlProcessListContexts implements YamlConfiguration {
- private Collection<YamlExecuteProcessContext> contexts = new
LinkedList<>();
+ private Collection<YamlProcessContext> contexts = new LinkedList<>();
}
diff --git
a/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/process/yaml/swapper/YamlExecuteProcessContextSwapper.java
b/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/process/yaml/swapper/YamlProcessContextSwapper.java
similarity index 73%
rename from
infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/process/yaml/swapper/YamlExecuteProcessContextSwapper.java
rename to
infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/process/yaml/swapper/YamlProcessContextSwapper.java
index 03ef69d78c8..600db92cadc 100644
---
a/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/process/yaml/swapper/YamlExecuteProcessContextSwapper.java
+++
b/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/process/yaml/swapper/YamlProcessContextSwapper.java
@@ -17,20 +17,20 @@
package org.apache.shardingsphere.infra.executor.sql.process.yaml.swapper;
-import
org.apache.shardingsphere.infra.executor.sql.process.model.ExecuteProcessContext;
+import
org.apache.shardingsphere.infra.executor.sql.process.model.ProcessContext;
import
org.apache.shardingsphere.infra.executor.sql.process.model.ExecuteProcessUnit;
-import
org.apache.shardingsphere.infra.executor.sql.process.yaml.YamlExecuteProcessContext;
+import
org.apache.shardingsphere.infra.executor.sql.process.yaml.YamlProcessContext;
import
org.apache.shardingsphere.infra.util.yaml.swapper.YamlConfigurationSwapper;
/**
- * YAML execute process context swapper.
+ * YAML process context swapper.
*/
-public final class YamlExecuteProcessContextSwapper implements
YamlConfigurationSwapper<YamlExecuteProcessContext, ExecuteProcessContext> {
+public final class YamlProcessContextSwapper implements
YamlConfigurationSwapper<YamlProcessContext, ProcessContext> {
@Override
- public YamlExecuteProcessContext swapToYamlConfiguration(final
ExecuteProcessContext data) {
- YamlExecuteProcessContext result = new YamlExecuteProcessContext();
- result.setExecutionID(data.getExecutionID());
+ public YamlProcessContext swapToYamlConfiguration(final ProcessContext
data) {
+ YamlProcessContext result = new YamlProcessContext();
+ result.setExecutionID(data.getProcessID());
result.setDatabaseName(data.getDatabaseName());
result.setUsername(data.getUsername());
result.setHostname(data.getHostname());
@@ -43,7 +43,7 @@ public final class YamlExecuteProcessContextSwapper
implements YamlConfiguration
}
@Override
- public ExecuteProcessContext swapToObject(final YamlExecuteProcessContext
yamlConfig) {
- throw new
UnsupportedOperationException("YamlExecuteProcessContextSwapper.swapToObject");
+ public ProcessContext swapToObject(final YamlProcessContext yamlConfig) {
+ throw new
UnsupportedOperationException("YamlProcessContextSwapper.swapToObject");
}
}
diff --git
a/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/process/yaml/swapper/YamlAllExecuteProcessContextsSwapper.java
b/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/process/yaml/swapper/YamlProcessListContextsSwapper.java
similarity index 57%
rename from
infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/process/yaml/swapper/YamlAllExecuteProcessContextsSwapper.java
rename to
infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/process/yaml/swapper/YamlProcessListContextsSwapper.java
index cdb2481b8c7..e0d04cc2a59 100644
---
a/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/process/yaml/swapper/YamlAllExecuteProcessContextsSwapper.java
+++
b/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/process/yaml/swapper/YamlProcessListContextsSwapper.java
@@ -17,29 +17,29 @@
package org.apache.shardingsphere.infra.executor.sql.process.yaml.swapper;
-import
org.apache.shardingsphere.infra.executor.sql.process.model.ExecuteProcessContext;
-import
org.apache.shardingsphere.infra.executor.sql.process.yaml.YamlAllExecuteProcessContexts;
+import
org.apache.shardingsphere.infra.executor.sql.process.model.ProcessContext;
+import
org.apache.shardingsphere.infra.executor.sql.process.yaml.YamlProcessListContexts;
import
org.apache.shardingsphere.infra.util.yaml.swapper.YamlConfigurationSwapper;
import java.util.Collection;
import java.util.stream.Collectors;
/**
- * YAML all execute process contexts swapper.
+ * YAML process list contexts swapper.
*/
-public final class YamlAllExecuteProcessContextsSwapper implements
YamlConfigurationSwapper<YamlAllExecuteProcessContexts,
Collection<ExecuteProcessContext>> {
+public final class YamlProcessListContextsSwapper implements
YamlConfigurationSwapper<YamlProcessListContexts, Collection<ProcessContext>> {
- private final YamlExecuteProcessContextSwapper
yamlExecuteProcessContextSwapper = new YamlExecuteProcessContextSwapper();
+ private final YamlProcessContextSwapper yamlProcessContextSwapper = new
YamlProcessContextSwapper();
@Override
- public YamlAllExecuteProcessContexts swapToYamlConfiguration(final
Collection<ExecuteProcessContext> data) {
- YamlAllExecuteProcessContexts result = new
YamlAllExecuteProcessContexts();
-
result.setContexts(data.stream().map(yamlExecuteProcessContextSwapper::swapToYamlConfiguration).collect(Collectors.toList()));
+ public YamlProcessListContexts swapToYamlConfiguration(final
Collection<ProcessContext> data) {
+ YamlProcessListContexts result = new YamlProcessListContexts();
+
result.setContexts(data.stream().map(yamlProcessContextSwapper::swapToYamlConfiguration).collect(Collectors.toList()));
return result;
}
@Override
- public Collection<ExecuteProcessContext> swapToObject(final
YamlAllExecuteProcessContexts yamlConfig) {
- throw new
UnsupportedOperationException("YamlAllExecuteProcessContextsSwapper.swapToObject");
+ public Collection<ProcessContext> swapToObject(final
YamlProcessListContexts yamlConfig) {
+ throw new
UnsupportedOperationException("YamlProcessListContextsSwapper.swapToObject");
}
}
diff --git
a/infra/executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/process/ExecuteProcessReporterTest.java
b/infra/executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/process/ProcessReporterTest.java
similarity index 89%
rename from
infra/executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/process/ExecuteProcessReporterTest.java
rename to
infra/executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/process/ProcessReporterTest.java
index 369811e0b27..d27713ed5e5 100644
---
a/infra/executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/process/ExecuteProcessReporterTest.java
+++
b/infra/executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/process/ProcessReporterTest.java
@@ -22,7 +22,7 @@ import
org.apache.shardingsphere.infra.executor.kernel.model.ExecutionGroupConte
import
org.apache.shardingsphere.infra.executor.kernel.model.ExecutionGroupReportContext;
import org.apache.shardingsphere.infra.executor.sql.context.ExecutionUnit;
import
org.apache.shardingsphere.infra.executor.sql.execute.engine.SQLExecutionUnit;
-import
org.apache.shardingsphere.infra.executor.sql.process.model.ExecuteProcessContext;
+import
org.apache.shardingsphere.infra.executor.sql.process.model.ProcessContext;
import org.apache.shardingsphere.test.mock.AutoMockExtension;
import org.apache.shardingsphere.test.mock.StaticMockSettings;
import org.junit.jupiter.api.BeforeEach;
@@ -40,7 +40,7 @@ import static org.mockito.Mockito.when;
@ExtendWith(AutoMockExtension.class)
@StaticMockSettings(ShowProcessListManager.class)
-class ExecuteProcessReporterTest {
+class ProcessReporterTest {
@Mock
private ShowProcessListManager showProcessListManager;
@@ -53,7 +53,7 @@ class ExecuteProcessReporterTest {
@Test
void assertReportExecute() {
ExecutionGroupContext<? extends SQLExecutionUnit>
executionGroupContext = mockExecutionGroupContext();
- new ExecuteProcessReporter().reportExecute(new QueryContext(null,
null, null), executionGroupContext);
+ new ProcessReporter().reportExecute(new QueryContext(null, null,
null), executionGroupContext);
verify(showProcessListManager).putProcessContext(eq(executionGroupContext.getReportContext().getExecutionID()),
any());
}
@@ -70,15 +70,15 @@ class ExecuteProcessReporterTest {
void assertReportUnit() {
SQLExecutionUnit sqlExecutionUnit = mock(SQLExecutionUnit.class);
when(sqlExecutionUnit.getExecutionUnit()).thenReturn(mock(ExecutionUnit.class));
-
when(showProcessListManager.getProcessContext("foo_id")).thenReturn(mock(ExecuteProcessContext.class));
- new ExecuteProcessReporter().reportComplete("foo_id",
sqlExecutionUnit);
+
when(showProcessListManager.getProcessContext("foo_id")).thenReturn(mock(ProcessContext.class));
+ new ProcessReporter().reportComplete("foo_id", sqlExecutionUnit);
verify(showProcessListManager).getProcessContext("foo_id");
}
@Test
void assertReportClean() {
-
when(showProcessListManager.getProcessContext("foo_id")).thenReturn(mock(ExecuteProcessContext.class));
- new ExecuteProcessReporter().reset("foo_id");
+
when(showProcessListManager.getProcessContext("foo_id")).thenReturn(mock(ProcessContext.class));
+ new ProcessReporter().reset("foo_id");
verify(showProcessListManager).removeProcessStatement("foo_id");
}
}
diff --git
a/infra/executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/process/yaml/swapper/YamlAllExecuteProcessContextsSwapperTest.java
b/infra/executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/process/yaml/swapper/YamlAllProcessContextsSwapperTest.java
similarity index 80%
rename from
infra/executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/process/yaml/swapper/YamlAllExecuteProcessContextsSwapperTest.java
rename to
infra/executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/process/yaml/swapper/YamlAllProcessContextsSwapperTest.java
index 4b03612c2b0..544267bd92b 100644
---
a/infra/executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/process/yaml/swapper/YamlAllExecuteProcessContextsSwapperTest.java
+++
b/infra/executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/process/yaml/swapper/YamlAllProcessContextsSwapperTest.java
@@ -20,9 +20,9 @@ package
org.apache.shardingsphere.infra.executor.sql.process.yaml.swapper;
import
org.apache.shardingsphere.infra.executor.kernel.model.ExecutionGroupContext;
import
org.apache.shardingsphere.infra.executor.kernel.model.ExecutionGroupReportContext;
import
org.apache.shardingsphere.infra.executor.sql.execute.engine.SQLExecutionUnit;
-import
org.apache.shardingsphere.infra.executor.sql.process.model.ExecuteProcessContext;
-import
org.apache.shardingsphere.infra.executor.sql.process.yaml.YamlAllExecuteProcessContexts;
-import
org.apache.shardingsphere.infra.executor.sql.process.yaml.YamlExecuteProcessContext;
+import
org.apache.shardingsphere.infra.executor.sql.process.model.ProcessContext;
+import
org.apache.shardingsphere.infra.executor.sql.process.yaml.YamlProcessListContexts;
+import
org.apache.shardingsphere.infra.executor.sql.process.yaml.YamlProcessContext;
import org.apache.shardingsphere.infra.metadata.user.Grantee;
import org.junit.jupiter.api.Test;
@@ -35,19 +35,19 @@ import static
org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
-class YamlAllExecuteProcessContextsSwapperTest {
+class YamlAllProcessContextsSwapperTest {
@Test
void assertSwapToYamlConfiguration() {
ExecutionGroupReportContext reportContext = new
ExecutionGroupReportContext("foo_db", new Grantee("root", "localhost"));
ExecutionGroupContext<? extends SQLExecutionUnit>
executionGroupContext = new ExecutionGroupContext<>(Collections.emptyList(),
reportContext);
- ExecuteProcessContext executeProcessContext = new
ExecuteProcessContext("SELECT 1", executionGroupContext);
- YamlAllExecuteProcessContexts actual = new
YamlAllExecuteProcessContextsSwapper().swapToYamlConfiguration(Collections.singleton(executeProcessContext));
+ ProcessContext processContext = new ProcessContext("SELECT 1",
executionGroupContext);
+ YamlProcessListContexts actual = new
YamlProcessListContextsSwapper().swapToYamlConfiguration(Collections.singleton(processContext));
assertThat(actual.getContexts().size(), is(1));
-
assertYamlExecuteProcessContext(actual.getContexts().iterator().next());
+ assertYamlProcessContext(actual.getContexts().iterator().next());
}
- private static void assertYamlExecuteProcessContext(final
YamlExecuteProcessContext actual) {
+ private static void assertYamlProcessContext(final YamlProcessContext
actual) {
assertNotNull(actual.getExecutionID());
assertThat(actual.getDatabaseName(), is("foo_db"));
assertThat(actual.getUsername(), is("root"));
@@ -61,6 +61,6 @@ class YamlAllExecuteProcessContextsSwapperTest {
@Test
void assertSwapToObject() {
- assertThrows(UnsupportedOperationException.class, () -> new
YamlAllExecuteProcessContextsSwapper().swapToObject(new
YamlAllExecuteProcessContexts()));
+ assertThrows(UnsupportedOperationException.class, () -> new
YamlProcessListContextsSwapper().swapToObject(new YamlProcessListContexts()));
}
}
diff --git
a/infra/executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/process/yaml/swapper/YamlExecuteProcessContextSwapperTest.java
b/infra/executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/process/yaml/swapper/YamlProcessContextSwapperTest.java
similarity index 86%
rename from
infra/executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/process/yaml/swapper/YamlExecuteProcessContextSwapperTest.java
rename to
infra/executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/process/yaml/swapper/YamlProcessContextSwapperTest.java
index 77653e47e69..9447e3d2b43 100644
---
a/infra/executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/process/yaml/swapper/YamlExecuteProcessContextSwapperTest.java
+++
b/infra/executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/process/yaml/swapper/YamlProcessContextSwapperTest.java
@@ -20,8 +20,8 @@ package
org.apache.shardingsphere.infra.executor.sql.process.yaml.swapper;
import
org.apache.shardingsphere.infra.executor.kernel.model.ExecutionGroupContext;
import
org.apache.shardingsphere.infra.executor.kernel.model.ExecutionGroupReportContext;
import
org.apache.shardingsphere.infra.executor.sql.execute.engine.SQLExecutionUnit;
-import
org.apache.shardingsphere.infra.executor.sql.process.model.ExecuteProcessContext;
-import
org.apache.shardingsphere.infra.executor.sql.process.yaml.YamlExecuteProcessContext;
+import
org.apache.shardingsphere.infra.executor.sql.process.model.ProcessContext;
+import
org.apache.shardingsphere.infra.executor.sql.process.yaml.YamlProcessContext;
import org.apache.shardingsphere.infra.metadata.user.Grantee;
import org.junit.jupiter.api.Test;
@@ -34,14 +34,14 @@ import static
org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
-class YamlExecuteProcessContextSwapperTest {
+class YamlProcessContextSwapperTest {
@Test
void assertSwapToYamlConfiguration() {
ExecutionGroupReportContext reportContext = new
ExecutionGroupReportContext("foo_db", new Grantee("root", "localhost"));
ExecutionGroupContext<? extends SQLExecutionUnit>
executionGroupContext = new ExecutionGroupContext<>(Collections.emptyList(),
reportContext);
- ExecuteProcessContext executeProcessContext = new
ExecuteProcessContext("SELECT 1", executionGroupContext);
- YamlExecuteProcessContext actual = new
YamlExecuteProcessContextSwapper().swapToYamlConfiguration(executeProcessContext);
+ ProcessContext processContext = new ProcessContext("SELECT 1",
executionGroupContext);
+ YamlProcessContext actual = new
YamlProcessContextSwapper().swapToYamlConfiguration(processContext);
assertNotNull(actual.getExecutionID());
assertThat(actual.getDatabaseName(), is("foo_db"));
assertThat(actual.getUsername(), is("root"));
@@ -55,6 +55,6 @@ class YamlExecuteProcessContextSwapperTest {
@Test
void assertSwapToObject() {
- assertThrows(UnsupportedOperationException.class, () -> new
YamlExecuteProcessContextSwapper().swapToObject(new
YamlExecuteProcessContext()));
+ assertThrows(UnsupportedOperationException.class, () -> new
YamlProcessContextSwapper().swapToObject(new YamlProcessContext()));
}
}
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 79c260215fc..6fa19d5d567 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
@@ -26,7 +26,7 @@ import
org.apache.shardingsphere.infra.executor.sql.execute.engine.driver.jdbc.J
import
org.apache.shardingsphere.infra.executor.sql.execute.engine.driver.jdbc.JDBCExecutor;
import
org.apache.shardingsphere.infra.executor.sql.execute.engine.driver.jdbc.JDBCExecutorCallback;
import
org.apache.shardingsphere.infra.executor.sql.execute.result.query.QueryResult;
-import
org.apache.shardingsphere.infra.executor.sql.process.ExecuteProcessEngine;
+import org.apache.shardingsphere.infra.executor.sql.process.ProcessEngine;
import org.apache.shardingsphere.infra.route.context.RouteUnit;
import org.apache.shardingsphere.infra.rule.ShardingSphereRule;
import
org.apache.shardingsphere.infra.rule.identifier.type.DataNodeContainedRule;
@@ -69,12 +69,12 @@ public final class DriverJDBCExecutor {
*/
public List<QueryResult> executeQuery(final
ExecutionGroupContext<JDBCExecutionUnit> executionGroupContext,
final QueryContext queryContext,
final ExecuteQueryCallback callback) throws SQLException {
- ExecuteProcessEngine executeProcessEngine = new ExecuteProcessEngine();
+ ProcessEngine processEngine = new ProcessEngine();
try {
- executeProcessEngine.initializeExecution(executionGroupContext,
queryContext);
+ processEngine.initializeExecution(executionGroupContext,
queryContext);
return jdbcExecutor.execute(executionGroupContext, callback);
} finally {
- executeProcessEngine.cleanExecution();
+ processEngine.cleanExecution();
}
}
@@ -90,14 +90,14 @@ public final class DriverJDBCExecutor {
*/
public int executeUpdate(final ExecutionGroupContext<JDBCExecutionUnit>
executionGroupContext,
final QueryContext queryContext, final
Collection<RouteUnit> routeUnits, final JDBCExecutorCallback<Integer> callback)
throws SQLException {
- ExecuteProcessEngine executeProcessEngine = new ExecuteProcessEngine();
+ ProcessEngine processEngine = new ProcessEngine();
try {
- executeProcessEngine.initializeExecution(executionGroupContext,
queryContext);
+ processEngine.initializeExecution(executionGroupContext,
queryContext);
SQLStatementContext<?> sqlStatementContext =
queryContext.getSqlStatementContext();
List<Integer> results = doExecute(executionGroupContext,
sqlStatementContext, routeUnits, callback);
return
isNeedAccumulate(metaDataContexts.getMetaData().getDatabase(databaseName).getRuleMetaData().getRules(),
sqlStatementContext) ? accumulate(results) : results.get(0);
} finally {
- executeProcessEngine.cleanExecution();
+ processEngine.cleanExecution();
}
}
@@ -130,13 +130,13 @@ public final class DriverJDBCExecutor {
*/
public boolean execute(final ExecutionGroupContext<JDBCExecutionUnit>
executionGroupContext, final QueryContext queryContext,
final Collection<RouteUnit> routeUnits, final
JDBCExecutorCallback<Boolean> callback) throws SQLException {
- ExecuteProcessEngine executeProcessEngine = new ExecuteProcessEngine();
+ ProcessEngine processEngine = new ProcessEngine();
try {
- executeProcessEngine.initializeExecution(executionGroupContext,
queryContext);
+ processEngine.initializeExecution(executionGroupContext,
queryContext);
List<Boolean> results = doExecute(executionGroupContext,
queryContext.getSqlStatementContext(), routeUnits, callback);
return null != results && !results.isEmpty() && null !=
results.get(0) && results.get(0);
} finally {
- executeProcessEngine.cleanExecution();
+ processEngine.cleanExecution();
}
}
diff --git
a/jdbc/core/src/main/java/org/apache/shardingsphere/driver/executor/sql/process/DriverExecuteProcessReporterCleaner.java
b/jdbc/core/src/main/java/org/apache/shardingsphere/driver/executor/sql/process/DriverProcessReporterCleaner.java
similarity index 79%
rename from
jdbc/core/src/main/java/org/apache/shardingsphere/driver/executor/sql/process/DriverExecuteProcessReporterCleaner.java
rename to
jdbc/core/src/main/java/org/apache/shardingsphere/driver/executor/sql/process/DriverProcessReporterCleaner.java
index a8f42677a81..ceb342af543 100644
---
a/jdbc/core/src/main/java/org/apache/shardingsphere/driver/executor/sql/process/DriverExecuteProcessReporterCleaner.java
+++
b/jdbc/core/src/main/java/org/apache/shardingsphere/driver/executor/sql/process/DriverProcessReporterCleaner.java
@@ -17,17 +17,17 @@
package org.apache.shardingsphere.driver.executor.sql.process;
-import
org.apache.shardingsphere.infra.executor.sql.process.ExecuteProcessReporterCleaner;
+import
org.apache.shardingsphere.infra.executor.sql.process.ProcessReporterCleaner;
import
org.apache.shardingsphere.infra.executor.sql.process.ShowProcessListManager;
-import
org.apache.shardingsphere.infra.executor.sql.process.model.ExecuteProcessContext;
+import
org.apache.shardingsphere.infra.executor.sql.process.model.ProcessContext;
/**
* Execute process reporter cleaner for driver.
*/
-public final class DriverExecuteProcessReporterCleaner implements
ExecuteProcessReporterCleaner {
+public final class DriverProcessReporterCleaner implements
ProcessReporterCleaner {
@Override
- public void reset(final ExecuteProcessContext context) {
-
ShowProcessListManager.getInstance().removeProcessContext(context.getExecutionID());
+ public void reset(final ProcessContext context) {
+
ShowProcessListManager.getInstance().removeProcessContext(context.getProcessID());
}
}
diff --git
a/proxy/bootstrap/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.executor.sql.process.ExecuteProcessReporterCleaner
b/jdbc/core/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.executor.sql.process.ProcessReporterCleaner
similarity index 89%
rename from
proxy/bootstrap/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.executor.sql.process.ExecuteProcessReporterCleaner
rename to
jdbc/core/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.executor.sql.process.ProcessReporterCleaner
index ba0c7f22624..5bb58d66c04 100644
---
a/proxy/bootstrap/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.executor.sql.process.ExecuteProcessReporterCleaner
+++
b/jdbc/core/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.executor.sql.process.ProcessReporterCleaner
@@ -15,4 +15,4 @@
# limitations under the License.
#
-org.apache.shardingsphere.proxy.executor.sql.process.ProxyExecuteProcessReporterCleaner
+org.apache.shardingsphere.driver.executor.sql.process.DriverProcessReporterCleaner
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 7e9e4817a8c..79277b57eb4 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
@@ -56,7 +56,7 @@ import
org.apache.shardingsphere.infra.executor.sql.execute.result.query.QueryRe
import
org.apache.shardingsphere.infra.executor.sql.execute.result.query.impl.driver.jdbc.type.memory.JDBCMemoryQueryResult;
import
org.apache.shardingsphere.infra.executor.sql.execute.result.query.impl.driver.jdbc.type.stream.JDBCStreamQueryResult;
import
org.apache.shardingsphere.infra.executor.sql.prepare.driver.DriverExecutionPrepareEngine;
-import
org.apache.shardingsphere.infra.executor.sql.process.ExecuteProcessEngine;
+import org.apache.shardingsphere.infra.executor.sql.process.ProcessEngine;
import org.apache.shardingsphere.infra.hint.HintValueContext;
import org.apache.shardingsphere.infra.merge.MergeEngine;
import org.apache.shardingsphere.infra.merge.result.MergedResult;
@@ -149,12 +149,12 @@ public final class FilterableTableScanExecutor implements
TableScanExecutor {
}
private AbstractEnumerable<Object[]> execute(final DatabaseType
databaseType, final QueryContext queryContext, final ShardingSphereDatabase
database, final ExecutionContext context) {
- ExecuteProcessEngine executeProcessEngine = new ExecuteProcessEngine();
+ ProcessEngine processEngine = new ProcessEngine();
try {
ExecutionGroupContext<JDBCExecutionUnit> executionGroupContext =
prepareEngine.prepare(context.getRouteContext(),
context.getExecutionUnits(), new
ExecutionGroupReportContext(database.getName()));
setParameters(executionGroupContext.getInputGroups());
- executeProcessEngine.initializeExecution(executionGroupContext,
context.getQueryContext());
+ processEngine.initializeExecution(executionGroupContext,
context.getQueryContext());
List<QueryResult> queryResults = execute(executionGroupContext,
databaseType);
// TODO need to get session context
MergeEngine mergeEngine = new MergeEngine(database,
executorContext.getProps(), new ConnectionContext());
@@ -164,7 +164,7 @@ public final class FilterableTableScanExecutor implements
TableScanExecutor {
} catch (final SQLException ex) {
throw new SQLWrapperException(ex);
} finally {
- executeProcessEngine.cleanExecution();
+ processEngine.cleanExecution();
}
}
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 15c0679839d..abe138b8620 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
@@ -60,7 +60,7 @@ import
org.apache.shardingsphere.infra.executor.sql.execute.result.query.QueryRe
import
org.apache.shardingsphere.infra.executor.sql.execute.result.query.impl.driver.jdbc.type.memory.JDBCMemoryQueryResult;
import
org.apache.shardingsphere.infra.executor.sql.execute.result.query.impl.driver.jdbc.type.stream.JDBCStreamQueryResult;
import
org.apache.shardingsphere.infra.executor.sql.prepare.driver.DriverExecutionPrepareEngine;
-import
org.apache.shardingsphere.infra.executor.sql.process.ExecuteProcessEngine;
+import org.apache.shardingsphere.infra.executor.sql.process.ProcessEngine;
import org.apache.shardingsphere.infra.hint.HintValueContext;
import org.apache.shardingsphere.infra.merge.MergeEngine;
import org.apache.shardingsphere.infra.merge.result.MergedResult;
@@ -175,12 +175,12 @@ public final class TranslatableTableScanExecutor
implements TableScanExecutor {
private AbstractEnumerable<Object> executeScalarEnumerable(final
DatabaseType databaseType, final QueryContext queryContext,
final
ShardingSphereDatabase database, final ExecutionContext context) {
- ExecuteProcessEngine executeProcessEngine = new ExecuteProcessEngine();
+ ProcessEngine processEngine = new ProcessEngine();
try {
ExecutionGroupContext<JDBCExecutionUnit> executionGroupContext =
prepareEngine.prepare(context.getRouteContext(),
context.getExecutionUnits(), new
ExecutionGroupReportContext(database.getName()));
setParameters(executionGroupContext.getInputGroups());
- executeProcessEngine.initializeExecution(executionGroupContext,
context.getQueryContext());
+ processEngine.initializeExecution(executionGroupContext,
context.getQueryContext());
List<QueryResult> queryResults = execute(executionGroupContext,
databaseType);
MergeEngine mergeEngine = new MergeEngine(database,
executorContext.getProps(), new ConnectionContext());
MergedResult mergedResult = mergeEngine.merge(queryResults,
queryContext.getSqlStatementContext());
@@ -189,7 +189,7 @@ public final class TranslatableTableScanExecutor implements
TableScanExecutor {
} catch (final SQLException ex) {
throw new SQLWrapperException(ex);
} finally {
- executeProcessEngine.cleanExecution();
+ processEngine.cleanExecution();
}
}
@@ -235,12 +235,12 @@ public final class TranslatableTableScanExecutor
implements TableScanExecutor {
}
private AbstractEnumerable<Object[]> execute(final DatabaseType
databaseType, final QueryContext queryContext, final ShardingSphereDatabase
database, final ExecutionContext context) {
- ExecuteProcessEngine executeProcessEngine = new ExecuteProcessEngine();
+ ProcessEngine processEngine = new ProcessEngine();
try {
ExecutionGroupContext<JDBCExecutionUnit> executionGroupContext =
prepareEngine.prepare(context.getRouteContext(),
context.getExecutionUnits(), new
ExecutionGroupReportContext(database.getName()));
setParameters(executionGroupContext.getInputGroups());
- executeProcessEngine.initializeExecution(executionGroupContext,
context.getQueryContext());
+ processEngine.initializeExecution(executionGroupContext,
context.getQueryContext());
List<QueryResult> queryResults = execute(executionGroupContext,
databaseType);
MergeEngine mergeEngine = new MergeEngine(database,
executorContext.getProps(), new ConnectionContext());
MergedResult mergedResult = mergeEngine.merge(queryResults,
queryContext.getSqlStatementContext());
@@ -249,7 +249,7 @@ public final class TranslatableTableScanExecutor implements
TableScanExecutor {
} catch (final SQLException ex) {
throw new SQLWrapperException(ex);
} finally {
- executeProcessEngine.cleanExecution();
+ processEngine.cleanExecution();
}
}
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/event/process/KillProcessListIdRequestEvent.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/event/process/KillProcessIdRequestEvent.java
similarity index 88%
rename from
mode/core/src/main/java/org/apache/shardingsphere/mode/event/process/KillProcessListIdRequestEvent.java
rename to
mode/core/src/main/java/org/apache/shardingsphere/mode/event/process/KillProcessIdRequestEvent.java
index 7b5dfdb17e9..533eccaa620 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/event/process/KillProcessListIdRequestEvent.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/event/process/KillProcessIdRequestEvent.java
@@ -21,11 +21,11 @@ import lombok.Getter;
import lombok.RequiredArgsConstructor;
/**
- * Kill process list id request event.
+ * Kill process id request event.
*/
@RequiredArgsConstructor
@Getter
-public final class KillProcessListIdRequestEvent {
+public final class KillProcessIdRequestEvent {
- private final String processListId;
+ private final String processId;
}
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/process/subscriber/ProcessRegistrySubscriber.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/process/subscriber/ProcessRegistrySubscriber.java
index 6d625e99e76..4194dd7f495 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/process/subscriber/ProcessRegistrySubscriber.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/process/subscriber/ProcessRegistrySubscriber.java
@@ -23,7 +23,7 @@ import
org.apache.shardingsphere.infra.executor.sql.process.lock.ShowProcessList
import org.apache.shardingsphere.infra.instance.metadata.InstanceType;
import org.apache.shardingsphere.infra.util.eventbus.EventBusContext;
import org.apache.shardingsphere.metadata.persist.node.ComputeNode;
-import
org.apache.shardingsphere.mode.event.process.KillProcessListIdRequestEvent;
+import org.apache.shardingsphere.mode.event.process.KillProcessIdRequestEvent;
import
org.apache.shardingsphere.mode.event.process.ShowProcessListRequestEvent;
import
org.apache.shardingsphere.mode.event.process.ShowProcessListResponseEvent;
import org.apache.shardingsphere.metadata.persist.node.ProcessNode;
@@ -97,8 +97,8 @@ public final class ProcessRegistrySubscriber {
* @param event get children request event.
*/
@Subscribe
- public void killProcessListId(final KillProcessListIdRequestEvent event) {
- String processListId = event.getProcessListId();
+ public void killProcessListId(final KillProcessIdRequestEvent event) {
+ String processListId = event.getProcessId();
boolean killProcessListIdIsComplete = false;
Collection<String> processKillPaths =
getProcessKillPaths(processListId);
try {
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/status/compute/event/KillProcessListIdEvent.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/status/compute/event/KillProcessIdEvent.java
similarity index 88%
rename from
mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/status/compute/event/KillProcessListIdEvent.java
rename to
mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/status/compute/event/KillProcessIdEvent.java
index 85068a55d9b..04052bc8467 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/status/compute/event/KillProcessListIdEvent.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/status/compute/event/KillProcessIdEvent.java
@@ -22,13 +22,13 @@ import lombok.RequiredArgsConstructor;
import
org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.GovernanceEvent;
/**
- * Kill process list id event.
+ * Kill process id event.
*/
@RequiredArgsConstructor
@Getter
-public final class KillProcessListIdEvent implements GovernanceEvent {
+public final class KillProcessIdEvent implements GovernanceEvent {
private final String instanceId;
- private final String processListId;
+ private final String processId;
}
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/status/compute/event/ShowProcessListTriggerEvent.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/status/compute/event/ShowProcessListTriggerEvent.java
index d0215d150aa..d2fa901c178 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/status/compute/event/ShowProcessListTriggerEvent.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/status/compute/event/ShowProcessListTriggerEvent.java
@@ -30,5 +30,5 @@ public final class ShowProcessListTriggerEvent implements
GovernanceEvent {
private final String instanceId;
- private final String processListId;
+ private final String processId;
}
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/status/compute/watcher/ComputeNodeStateChangedWatcher.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/status/compute/watcher/ComputeNodeStateChangedWatcher.java
index 7deb2b78353..fef25662c9e 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/status/compute/watcher/ComputeNodeStateChangedWatcher.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/status/compute/watcher/ComputeNodeStateChangedWatcher.java
@@ -27,7 +27,7 @@ import
org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.Gover
import
org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.GovernanceWatcher;
import
org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.status.compute.event.InstanceOfflineEvent;
import
org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.status.compute.event.InstanceOnlineEvent;
-import
org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.status.compute.event.KillProcessListIdEvent;
+import
org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.status.compute.event.KillProcessIdEvent;
import
org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.status.compute.event.KillProcessListIdUnitCompleteEvent;
import
org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.status.compute.event.LabelsEvent;
import
org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.status.compute.event.ShowProcessListTriggerEvent;
@@ -132,7 +132,7 @@ public final class ComputeNodeStateChangedWatcher
implements GovernanceWatcher<G
return Optional.empty();
}
if (Type.ADDED == event.getType()) {
- return Optional.of(new KillProcessListIdEvent(matcher.group(1),
matcher.group(2)));
+ return Optional.of(new KillProcessIdEvent(matcher.group(1),
matcher.group(2)));
}
if (Type.DELETED == event.getType()) {
return Optional.of(new
KillProcessListIdUnitCompleteEvent(matcher.group(2)));
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/ProcessListChangedSubscriber.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/ProcessListChangedSubscriber.java
index 5845e071eef..966207df80c 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/ProcessListChangedSubscriber.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/ProcessListChangedSubscriber.java
@@ -20,14 +20,14 @@ package
org.apache.shardingsphere.mode.manager.cluster.coordinator.subscriber;
import com.google.common.eventbus.Subscribe;
import
org.apache.shardingsphere.infra.executor.sql.process.ShowProcessListManager;
import
org.apache.shardingsphere.infra.executor.sql.process.lock.ShowProcessListSimpleLock;
-import
org.apache.shardingsphere.infra.executor.sql.process.model.ExecuteProcessContext;
-import
org.apache.shardingsphere.infra.executor.sql.process.yaml.swapper.YamlAllExecuteProcessContextsSwapper;
+import
org.apache.shardingsphere.infra.executor.sql.process.model.ProcessContext;
+import
org.apache.shardingsphere.infra.executor.sql.process.yaml.swapper.YamlProcessListContextsSwapper;
import org.apache.shardingsphere.infra.util.yaml.YamlEngine;
import org.apache.shardingsphere.metadata.persist.node.ComputeNode;
import org.apache.shardingsphere.metadata.persist.node.ProcessNode;
import org.apache.shardingsphere.mode.manager.ContextManager;
import
org.apache.shardingsphere.mode.manager.cluster.coordinator.RegistryCenter;
-import
org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.status.compute.event.KillProcessListIdEvent;
+import
org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.status.compute.event.KillProcessIdEvent;
import
org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.status.compute.event.KillProcessListIdUnitCompleteEvent;
import
org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.status.compute.event.ShowProcessListTriggerEvent;
import
org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.status.compute.event.ShowProcessListUnitCompleteEvent;
@@ -46,7 +46,7 @@ public final class ProcessListChangedSubscriber {
private final ContextManager contextManager;
- private final YamlAllExecuteProcessContextsSwapper swapper = new
YamlAllExecuteProcessContextsSwapper();
+ private final YamlProcessListContextsSwapper swapper = new
YamlProcessListContextsSwapper();
public ProcessListChangedSubscriber(final RegistryCenter registryCenter,
final ContextManager contextManager) {
this.registryCenter = registryCenter;
@@ -64,30 +64,30 @@ public final class ProcessListChangedSubscriber {
if
(!event.getInstanceId().equals(contextManager.getInstanceContext().getInstance().getMetaData().getId()))
{
return;
}
- Collection<ExecuteProcessContext> processContexts =
ShowProcessListManager.getInstance().getAllProcessContext();
+ Collection<ProcessContext> processContexts =
ShowProcessListManager.getInstance().getAllProcessContext();
if (!processContexts.isEmpty()) {
registryCenter.getRepository().persist(
-
ProcessNode.getProcessListInstancePath(event.getProcessListId(),
event.getInstanceId()),
YamlEngine.marshal(swapper.swapToYamlConfiguration(processContexts)));
+
ProcessNode.getProcessListInstancePath(event.getProcessId(),
event.getInstanceId()),
YamlEngine.marshal(swapper.swapToYamlConfiguration(processContexts)));
}
-
registryCenter.getRepository().delete(ComputeNode.getProcessTriggerInstanceIdNodePath(event.getInstanceId(),
event.getProcessListId()));
+
registryCenter.getRepository().delete(ComputeNode.getProcessTriggerInstanceIdNodePath(event.getInstanceId(),
event.getProcessId()));
}
/**
- * Kill process list id.
+ * Kill process id.
*
- * @param event kill process list id event
+ * @param event kill process id event
* @throws SQLException SQL exception
*/
@Subscribe
- public synchronized void killProcessListId(final KillProcessListIdEvent
event) throws SQLException {
+ public synchronized void killProcessId(final KillProcessIdEvent event)
throws SQLException {
if
(!event.getInstanceId().equals(contextManager.getInstanceContext().getInstance().getMetaData().getId()))
{
return;
}
- Collection<Statement> statements =
ShowProcessListManager.getInstance().getProcessStatement(event.getProcessListId());
+ Collection<Statement> statements =
ShowProcessListManager.getInstance().getProcessStatement(event.getProcessId());
for (Statement statement : statements) {
statement.cancel();
}
-
registryCenter.getRepository().delete(ComputeNode.getProcessKillInstanceIdNodePath(event.getInstanceId(),
event.getProcessListId()));
+
registryCenter.getRepository().delete(ComputeNode.getProcessKillInstanceIdNodePath(event.getInstanceId(),
event.getProcessId()));
}
/**
diff --git
a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/ProcessListChangedSubscriberTest.java
b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/ProcessListChangedSubscriberTest.java
index fc7693049ee..da1424ea453 100644
---
a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/ProcessListChangedSubscriberTest.java
+++
b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/ProcessListChangedSubscriberTest.java
@@ -22,7 +22,7 @@ import
org.apache.shardingsphere.infra.config.props.ConfigurationProperties;
import org.apache.shardingsphere.infra.database.type.dialect.MySQLDatabaseType;
import
org.apache.shardingsphere.infra.executor.sql.process.ShowProcessListManager;
import
org.apache.shardingsphere.infra.executor.sql.process.lock.ShowProcessListSimpleLock;
-import
org.apache.shardingsphere.infra.executor.sql.process.model.ExecuteProcessContext;
+import
org.apache.shardingsphere.infra.executor.sql.process.model.ProcessContext;
import org.apache.shardingsphere.infra.instance.metadata.InstanceMetaData;
import
org.apache.shardingsphere.infra.instance.metadata.proxy.ProxyInstanceMetaData;
import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
@@ -34,7 +34,7 @@ import org.apache.shardingsphere.mode.manager.ContextManager;
import org.apache.shardingsphere.mode.manager.ContextManagerBuilderParameter;
import
org.apache.shardingsphere.mode.manager.cluster.ClusterContextManagerBuilder;
import
org.apache.shardingsphere.mode.manager.cluster.coordinator.RegistryCenter;
-import
org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.status.compute.event.KillProcessListIdEvent;
+import
org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.status.compute.event.KillProcessIdEvent;
import
org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.status.compute.event.ShowProcessListTriggerEvent;
import
org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.status.compute.event.ShowProcessListUnitCompleteEvent;
import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
@@ -122,7 +122,7 @@ class ProcessListChangedSubscriberTest {
@Test
void assertTriggerShowProcessList() throws ReflectiveOperationException {
String instanceId =
contextManager.getInstanceContext().getInstance().getMetaData().getId();
-
ShowProcessListManager.getInstance().putProcessContext("foo_execution_id",
mock(ExecuteProcessContext.class));
+
ShowProcessListManager.getInstance().putProcessContext("foo_execution_id",
mock(ProcessContext.class));
String processListId = "foo_process_id";
subscriber.triggerShowProcessList(new
ShowProcessListTriggerEvent(instanceId, processListId));
ClusterPersistRepository repository = ((RegistryCenter)
Plugins.getMemberAccessor().get(ProcessListChangedSubscriber.class.getDeclaredField("registryCenter"),
subscriber)).getRepository();
@@ -135,7 +135,7 @@ class ProcessListChangedSubscriberTest {
void assertKillProcessListId() throws SQLException,
ReflectiveOperationException {
String instanceId =
contextManager.getInstanceContext().getInstance().getMetaData().getId();
String processId = "foo_process_id";
- subscriber.killProcessListId(new KillProcessListIdEvent(instanceId,
processId));
+ subscriber.killProcessId(new KillProcessIdEvent(instanceId,
processId));
ClusterPersistRepository repository = ((RegistryCenter)
Plugins.getMemberAccessor().get(ProcessListChangedSubscriber.class.getDeclaredField("registryCenter"),
subscriber)).getRepository();
verify(repository).delete("/nodes/compute_nodes/process_kill/" +
instanceId + ":foo_process_id");
}
diff --git
a/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/subscriber/ProcessStandaloneSubscriber.java
b/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/subscriber/ProcessStandaloneSubscriber.java
index 9bcb37d8447..abc4e2877ff 100644
---
a/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/subscriber/ProcessStandaloneSubscriber.java
+++
b/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/subscriber/ProcessStandaloneSubscriber.java
@@ -20,11 +20,11 @@ package
org.apache.shardingsphere.mode.manager.standalone.subscriber;
import com.google.common.eventbus.Subscribe;
import lombok.SneakyThrows;
import
org.apache.shardingsphere.infra.executor.sql.process.ShowProcessListManager;
-import
org.apache.shardingsphere.infra.executor.sql.process.yaml.YamlAllExecuteProcessContexts;
-import
org.apache.shardingsphere.infra.executor.sql.process.yaml.swapper.YamlAllExecuteProcessContextsSwapper;
+import
org.apache.shardingsphere.infra.executor.sql.process.yaml.YamlProcessListContexts;
+import
org.apache.shardingsphere.infra.executor.sql.process.yaml.swapper.YamlProcessListContextsSwapper;
import org.apache.shardingsphere.infra.util.eventbus.EventBusContext;
import org.apache.shardingsphere.infra.util.yaml.YamlEngine;
-import
org.apache.shardingsphere.mode.event.process.KillProcessListIdRequestEvent;
+import org.apache.shardingsphere.mode.event.process.KillProcessIdRequestEvent;
import
org.apache.shardingsphere.mode.event.process.ShowProcessListRequestEvent;
import
org.apache.shardingsphere.mode.event.process.ShowProcessListResponseEvent;
@@ -41,7 +41,7 @@ public final class ProcessStandaloneSubscriber {
private final EventBusContext eventBusContext;
- private final YamlAllExecuteProcessContextsSwapper swapper = new
YamlAllExecuteProcessContextsSwapper();
+ private final YamlProcessListContextsSwapper swapper = new
YamlProcessListContextsSwapper();
public ProcessStandaloneSubscriber(final EventBusContext eventBusContext) {
this.eventBusContext = eventBusContext;
@@ -55,19 +55,19 @@ public final class ProcessStandaloneSubscriber {
*/
@Subscribe
public void loadShowProcessListData(final ShowProcessListRequestEvent
event) {
- YamlAllExecuteProcessContexts yamlContexts =
swapper.swapToYamlConfiguration(ShowProcessListManager.getInstance().getProcessContexts().values());
+ YamlProcessListContexts yamlContexts =
swapper.swapToYamlConfiguration(ShowProcessListManager.getInstance().getProcessContexts().values());
eventBusContext.post(new
ShowProcessListResponseEvent(yamlContexts.getContexts().isEmpty() ?
Collections.emptyList() :
Collections.singleton(YamlEngine.marshal(yamlContexts))));
}
/**
- * Kill process list id.
+ * Kill process id.
*
- * @param event kill process list id request event.
+ * @param event kill process id request event.
*/
@Subscribe
@SneakyThrows(SQLException.class)
- public void killProcessListId(final KillProcessListIdRequestEvent event) {
- Collection<Statement> statements =
ShowProcessListManager.getInstance().getProcessStatement(event.getProcessListId());
+ public void killProcessId(final KillProcessIdRequestEvent event) {
+ Collection<Statement> statements =
ShowProcessListManager.getInstance().getProcessStatement(event.getProcessId());
for (Statement statement : statements) {
statement.cancel();
}
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/connector/jdbc/executor/ProxyJDBCExecutor.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/connector/jdbc/executor/ProxyJDBCExecutor.java
index d4390aea87a..f8d3a93044f 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/connector/jdbc/executor/ProxyJDBCExecutor.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/connector/jdbc/executor/ProxyJDBCExecutor.java
@@ -25,7 +25,7 @@ import
org.apache.shardingsphere.infra.executor.kernel.model.ExecutionGroupConte
import
org.apache.shardingsphere.infra.executor.sql.execute.engine.driver.jdbc.JDBCExecutionUnit;
import
org.apache.shardingsphere.infra.executor.sql.execute.engine.driver.jdbc.JDBCExecutor;
import
org.apache.shardingsphere.infra.executor.sql.execute.result.ExecuteResult;
-import
org.apache.shardingsphere.infra.executor.sql.process.ExecuteProcessEngine;
+import org.apache.shardingsphere.infra.executor.sql.process.ProcessEngine;
import
org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
import org.apache.shardingsphere.proxy.backend.connector.DatabaseConnector;
@@ -63,13 +63,13 @@ public final class ProxyJDBCExecutor {
*/
public List<ExecuteResult> execute(final QueryContext queryContext, final
ExecutionGroupContext<JDBCExecutionUnit> executionGroupContext,
final boolean isReturnGeneratedKeys,
final boolean isExceptionThrown) throws SQLException {
- ExecuteProcessEngine executeProcessEngine = new ExecuteProcessEngine();
+ ProcessEngine processEngine = new ProcessEngine();
try {
MetaDataContexts metaDataContexts =
ProxyContext.getInstance().getContextManager().getMetaDataContexts();
ShardingSphereDatabase database =
metaDataContexts.getMetaData().getDatabase(connectionSession.getDatabaseName());
DatabaseType protocolType = database.getProtocolType();
Map<String, DatabaseType> storageTypes =
database.getResourceMetaData().getStorageTypes();
- executeProcessEngine.initializeExecution(executionGroupContext,
queryContext);
+ processEngine.initializeExecution(executionGroupContext,
queryContext);
SQLStatementContext<?> context =
queryContext.getSqlStatementContext();
return jdbcExecutor.execute(executionGroupContext,
ProxyJDBCExecutorCallbackFactory.newInstance(type,
protocolType, storageTypes, context.getSqlStatement(), databaseConnector,
isReturnGeneratedKeys, isExceptionThrown,
@@ -77,7 +77,7 @@ public final class ProxyJDBCExecutor {
ProxyJDBCExecutorCallbackFactory.newInstance(type,
protocolType, storageTypes, context.getSqlStatement(), databaseConnector,
isReturnGeneratedKeys, isExceptionThrown,
false));
} finally {
- executeProcessEngine.cleanExecution();
+ processEngine.cleanExecution();
}
}
}
diff --git
a/proxy/backend/type/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/KillProcessExecutor.java
b/proxy/backend/type/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/KillProcessExecutor.java
index f8645103822..759b30f933f 100644
---
a/proxy/backend/type/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/KillProcessExecutor.java
+++
b/proxy/backend/type/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/KillProcessExecutor.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.proxy.backend.mysql.handler.admin.executor;
import lombok.RequiredArgsConstructor;
-import
org.apache.shardingsphere.mode.event.process.KillProcessListIdRequestEvent;
+import org.apache.shardingsphere.mode.event.process.KillProcessIdRequestEvent;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
import
org.apache.shardingsphere.proxy.backend.handler.admin.executor.DatabaseAdminExecutor;
import org.apache.shardingsphere.proxy.backend.session.ConnectionSession;
@@ -40,6 +40,6 @@ public final class KillProcessExecutor implements
DatabaseAdminExecutor {
@Override
public void execute(final ConnectionSession connectionSession) {
String processlistId = killStatement.getProcesslistId();
-
ProxyContext.getInstance().getContextManager().getInstanceContext().getEventBusContext().post(new
KillProcessListIdRequestEvent(processlistId));
+
ProxyContext.getInstance().getContextManager().getInstanceContext().getEventBusContext().post(new
KillProcessIdRequestEvent(processlistId));
}
}
diff --git
a/proxy/backend/type/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/ShowProcessListExecutor.java
b/proxy/backend/type/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/ShowProcessListExecutor.java
index 5c735d26031..7790ef08d57 100644
---
a/proxy/backend/type/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/ShowProcessListExecutor.java
+++
b/proxy/backend/type/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/ShowProcessListExecutor.java
@@ -25,8 +25,8 @@ import
org.apache.shardingsphere.infra.executor.sql.execute.result.query.impl.ra
import
org.apache.shardingsphere.infra.executor.sql.execute.result.query.impl.raw.metadata.RawQueryResultMetaData;
import
org.apache.shardingsphere.infra.executor.sql.execute.result.query.impl.raw.type.RawMemoryQueryResult;
import
org.apache.shardingsphere.infra.executor.sql.execute.result.query.type.memory.row.MemoryQueryResultDataRow;
-import
org.apache.shardingsphere.infra.executor.sql.process.yaml.YamlAllExecuteProcessContexts;
-import
org.apache.shardingsphere.infra.executor.sql.process.yaml.YamlExecuteProcessContext;
+import
org.apache.shardingsphere.infra.executor.sql.process.yaml.YamlProcessListContexts;
+import
org.apache.shardingsphere.infra.executor.sql.process.yaml.YamlProcessContext;
import org.apache.shardingsphere.infra.merge.result.MergedResult;
import
org.apache.shardingsphere.infra.merge.result.impl.transparent.TransparentMergedResult;
import org.apache.shardingsphere.infra.util.yaml.YamlEngine;
@@ -84,30 +84,30 @@ public final class ShowProcessListExecutor implements
DatabaseAdminQueryExecutor
if (null == batchProcessContexts || batchProcessContexts.isEmpty()) {
return new RawMemoryQueryResult(queryResultMetaData,
Collections.emptyList());
}
- Collection<YamlExecuteProcessContext> processContexts = new
LinkedList<>();
+ Collection<YamlProcessContext> processContexts = new LinkedList<>();
for (String each : batchProcessContexts) {
- processContexts.addAll(YamlEngine.unmarshal(each,
YamlAllExecuteProcessContexts.class).getContexts());
+ processContexts.addAll(YamlEngine.unmarshal(each,
YamlProcessListContexts.class).getContexts());
}
List<MemoryQueryResultDataRow> rows =
processContexts.stream().map(ShowProcessListExecutor::getMemoryQueryResultDataRow).collect(Collectors.toList());
return new RawMemoryQueryResult(queryResultMetaData, rows);
}
- private static MemoryQueryResultDataRow getMemoryQueryResultDataRow(final
YamlExecuteProcessContext yamlExecuteProcessContext) {
+ private static MemoryQueryResultDataRow getMemoryQueryResultDataRow(final
YamlProcessContext yamlProcessContext) {
List<Object> rowValues = new ArrayList<>(8);
- rowValues.add(yamlExecuteProcessContext.getExecutionID());
- rowValues.add(yamlExecuteProcessContext.getUsername());
- rowValues.add(yamlExecuteProcessContext.getHostname());
- rowValues.add(yamlExecuteProcessContext.getDatabaseName());
- rowValues.add(yamlExecuteProcessContext.isExecuting() ? "Execute" :
"Sleep");
-
rowValues.add(TimeUnit.MILLISECONDS.toSeconds(System.currentTimeMillis() -
yamlExecuteProcessContext.getStartTimeMillis()));
+ rowValues.add(yamlProcessContext.getExecutionID());
+ rowValues.add(yamlProcessContext.getUsername());
+ rowValues.add(yamlProcessContext.getHostname());
+ rowValues.add(yamlProcessContext.getDatabaseName());
+ rowValues.add(yamlProcessContext.isExecuting() ? "Execute" : "Sleep");
+
rowValues.add(TimeUnit.MILLISECONDS.toSeconds(System.currentTimeMillis() -
yamlProcessContext.getStartTimeMillis()));
String sql = null;
- if (!yamlExecuteProcessContext.isExecuting()) {
+ if (!yamlProcessContext.isExecuting()) {
rowValues.add("");
} else {
- int processDoneCount =
yamlExecuteProcessContext.getCompletedUnitCount();
+ int processDoneCount = yamlProcessContext.getCompletedUnitCount();
String statePrefix = "Executing ";
- rowValues.add(statePrefix + processDoneCount + "/" +
yamlExecuteProcessContext.getTotalUnitCount());
- sql = yamlExecuteProcessContext.getSql();
+ rowValues.add(statePrefix + processDoneCount + "/" +
yamlProcessContext.getTotalUnitCount());
+ sql = yamlProcessContext.getSql();
}
if (null != sql && sql.length() > 100) {
sql = sql.substring(0, 100);
diff --git
a/proxy/bootstrap/src/main/java/org/apache/shardingsphere/proxy/executor/sql/process/ProxyExecuteProcessReporterCleaner.java
b/proxy/bootstrap/src/main/java/org/apache/shardingsphere/proxy/executor/sql/process/ProxyProcessReporterCleaner.java
similarity index 79%
rename from
proxy/bootstrap/src/main/java/org/apache/shardingsphere/proxy/executor/sql/process/ProxyExecuteProcessReporterCleaner.java
rename to
proxy/bootstrap/src/main/java/org/apache/shardingsphere/proxy/executor/sql/process/ProxyProcessReporterCleaner.java
index ade9fd7ef8a..3e30a836caf 100644
---
a/proxy/bootstrap/src/main/java/org/apache/shardingsphere/proxy/executor/sql/process/ProxyExecuteProcessReporterCleaner.java
+++
b/proxy/bootstrap/src/main/java/org/apache/shardingsphere/proxy/executor/sql/process/ProxyProcessReporterCleaner.java
@@ -17,16 +17,16 @@
package org.apache.shardingsphere.proxy.executor.sql.process;
-import
org.apache.shardingsphere.infra.executor.sql.process.ExecuteProcessReporterCleaner;
-import
org.apache.shardingsphere.infra.executor.sql.process.model.ExecuteProcessContext;
+import
org.apache.shardingsphere.infra.executor.sql.process.ProcessReporterCleaner;
+import
org.apache.shardingsphere.infra.executor.sql.process.model.ProcessContext;
/**
* Execute process reporter cleaner for proxy.
*/
-public final class ProxyExecuteProcessReporterCleaner implements
ExecuteProcessReporterCleaner {
+public final class ProxyProcessReporterCleaner implements
ProcessReporterCleaner {
@Override
- public void reset(final ExecuteProcessContext context) {
+ public void reset(final ProcessContext context) {
context.reset();
}
}
diff --git
a/jdbc/core/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.executor.sql.process.ExecuteProcessReporterCleaner
b/proxy/bootstrap/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.executor.sql.process.ProcessReporterCleaner
similarity index 89%
rename from
jdbc/core/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.executor.sql.process.ExecuteProcessReporterCleaner
rename to
proxy/bootstrap/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.executor.sql.process.ProcessReporterCleaner
index b9e2689a923..42d2e2d77e1 100644
---
a/jdbc/core/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.executor.sql.process.ExecuteProcessReporterCleaner
+++
b/proxy/bootstrap/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.executor.sql.process.ProcessReporterCleaner
@@ -15,4 +15,4 @@
# limitations under the License.
#
-org.apache.shardingsphere.driver.executor.sql.process.DriverExecuteProcessReporterCleaner
+org.apache.shardingsphere.proxy.executor.sql.process.ProxyProcessReporterCleaner
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 67ca9335bd4..1d8efd9d9ec 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
@@ -25,7 +25,7 @@ import lombok.extern.slf4j.Slf4j;
import org.apache.shardingsphere.db.protocol.constant.CommonConstants;
import org.apache.shardingsphere.db.protocol.payload.PacketPayload;
import org.apache.shardingsphere.infra.database.type.DatabaseType;
-import
org.apache.shardingsphere.infra.executor.sql.process.ExecuteProcessEngine;
+import org.apache.shardingsphere.infra.executor.sql.process.ProcessEngine;
import org.apache.shardingsphere.infra.metadata.user.Grantee;
import org.apache.shardingsphere.infra.util.spi.type.typed.TypedSPILoader;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
@@ -80,7 +80,7 @@ public final class FrontendChannelInboundHandler extends
ChannelInboundHandlerAd
if (authResult.isFinished()) {
connectionSession.setGrantee(new
Grantee(authResult.getUsername(), authResult.getHostname()));
connectionSession.setCurrentDatabase(authResult.getDatabase());
- connectionSession.setExecutionId(new
ExecuteProcessEngine().initializeConnection(connectionSession.getGrantee(),
connectionSession.getDatabaseName()));
+ connectionSession.setExecutionId(new
ProcessEngine().initializeConnection(connectionSession.getGrantee(),
connectionSession.getDatabaseName()));
}
return authResult.isFinished();
// CHECKSTYLE:OFF
@@ -106,7 +106,7 @@ public final class FrontendChannelInboundHandler extends
ChannelInboundHandlerAd
private void closeAllResources() {
ConnectionThreadExecutorGroup.getInstance().unregisterAndAwaitTermination(connectionSession.getConnectionId());
connectionSession.getBackendConnection().closeAllResources();
- Optional.ofNullable(connectionSession.getExecutionId()).ifPresent(new
ExecuteProcessEngine()::finishConnection);
+ Optional.ofNullable(connectionSession.getExecutionId()).ifPresent(new
ProcessEngine()::finishConnection);
databaseProtocolFrontendEngine.release(connectionSession);
}
diff --git
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/dal/impl/KillStatementAssert.java
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/dal/impl/KillStatementAssert.java
index 636929299b2..f11aa0c1e6b 100644
---
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/dal/impl/KillStatementAssert.java
+++
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/dal/impl/KillStatementAssert.java
@@ -40,6 +40,6 @@ public final class KillStatementAssert {
* @param expected expected kill statement test case
*/
public static void assertIs(final SQLCaseAssertContext assertContext,
final MySQLKillStatement actual, final KillStatementTestCase expected) {
- assertThat(assertContext.getText("Kill statement context does not
match: "), actual.getProcesslistId(), is(expected.getProcesslistId()));
+ assertThat(assertContext.getText("Kill statement context does not
match: "), actual.getProcesslistId(), is(expected.getProcessId()));
}
}
diff --git
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/cases/parser/jaxb/statement/dal/KillStatementTestCase.java
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/cases/parser/jaxb/statement/dal/KillStatementTestCase.java
index 78a3bc3f612..397f205d096 100644
---
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/cases/parser/jaxb/statement/dal/KillStatementTestCase.java
+++
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/cases/parser/jaxb/statement/dal/KillStatementTestCase.java
@@ -30,6 +30,6 @@ import javax.xml.bind.annotation.XmlAttribute;
@Setter
public final class KillStatementTestCase extends SQLParserTestCase {
- @XmlAttribute(name = "processlist-id")
- private String processlistId;
+ @XmlAttribute(name = "process-id")
+ private String processId;
}
diff --git a/test/it/parser/src/main/resources/case/dal/kill.xml
b/test/it/parser/src/main/resources/case/dal/kill.xml
index 2f606a152e7..22ceff65141 100644
--- a/test/it/parser/src/main/resources/case/dal/kill.xml
+++ b/test/it/parser/src/main/resources/case/dal/kill.xml
@@ -17,5 +17,5 @@
-->
<sql-parser-test-cases>
- <kill sql-case-id="kill_processlist_id" processlist-id="abc" />
+ <kill sql-case-id="kill_process_id" process-id="abc" />
</sql-parser-test-cases>
diff --git a/test/it/parser/src/main/resources/sql/supported/dal/kill.xml
b/test/it/parser/src/main/resources/sql/supported/dal/kill.xml
index 76f4344dd97..5869dd4d023 100644
--- a/test/it/parser/src/main/resources/sql/supported/dal/kill.xml
+++ b/test/it/parser/src/main/resources/sql/supported/dal/kill.xml
@@ -17,5 +17,5 @@
-->
<sql-cases>
- <sql-case id="kill_processlist_id" value="KILL abc" db-types="MySQL" />
+ <sql-case id="kill_process_id" value="KILL abc" db-types="MySQL" />
</sql-cases>
