You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by su...@apache.org on 2023/04/27 16:11:23 UTC
[shardingsphere] branch master updated: Rename ExecuteProcessUnit.status (#25380)
This is an automated email from the ASF dual-hosted git repository.
sunnianjun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new 79c6534ecef Rename ExecuteProcessUnit.status (#25380)
79c6534ecef is described below
commit 79c6534ecef94e3f21da8ec3d976f48aefe62e1f
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Fri Apr 28 00:11:15 2023 +0800
Rename ExecuteProcessUnit.status (#25380)
* Rename ExecuteProcessUnit.status
* Rename ExecuteProcessUnit.status
* Refactor ExecuteProcessContext
* Refactor ExecuteProcessContext
---
.../executor/sql/process/ExecuteProcessEngine.java | 4 ++--
.../sql/process/ExecuteProcessReporter.java | 12 ++++++------
.../sql/process/model/ExecuteProcessContext.java | 21 ++++++++++-----------
.../sql/process/model/ExecuteProcessUnit.java | 6 +++---
.../swapper/YamlExecuteProcessContextSwapper.java | 4 ++--
.../yaml/swapper/YamlExecuteProcessUnitSwapper.java | 2 +-
.../sql/process/ExecuteProcessReporterTest.java | 2 +-
.../subscriber/ProcessRegistrySubscriber.java | 6 +++---
8 files changed, 28 insertions(+), 29 deletions(-)
diff --git a/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/process/ExecuteProcessEngine.java b/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/process/ExecuteProcessEngine.java
index 8cc62759ab6..414ec0b6c9c 100644
--- a/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/process/ExecuteProcessEngine.java
+++ b/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/process/ExecuteProcessEngine.java
@@ -60,7 +60,7 @@ public final class ExecuteProcessEngine {
* @param executionID execution ID
*/
public void finishConnection(final String executionID) {
- reporter.reportRemove(executionID);
+ reporter.remove(executionID);
}
/**
@@ -95,7 +95,7 @@ public final class ExecuteProcessEngine {
if (ExecuteIDContext.isEmpty()) {
return;
}
- reporter.reportClean(ExecuteIDContext.get());
+ reporter.reset(ExecuteIDContext.get());
ExecuteIDContext.remove();
}
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/ExecuteProcessReporter.java
index 1f1d76b365c..6ce5d1f2f28 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/ExecuteProcessReporter.java
@@ -67,33 +67,33 @@ public final class ExecuteProcessReporter {
public void report(final String executionID, final SQLExecutionUnit executionUnit, final ExecuteProcessStatus processStatus) {
ExecuteProcessUnit executeProcessUnit = new ExecuteProcessUnit(executionUnit.getExecutionUnit(), processStatus);
ExecuteProcessContext executeProcessContext = ShowProcessListManager.getInstance().getProcessContext(executionID);
- Optional.ofNullable(executeProcessContext.getProcessUnits().get(executeProcessUnit.getUnitID())).ifPresent(optional -> optional.setProcessStatus(executeProcessUnit.getProcessStatus()));
+ Optional.ofNullable(executeProcessContext.getProcessUnits().get(executeProcessUnit.getUnitID())).ifPresent(optional -> optional.setStatus(executeProcessUnit.getStatus()));
}
/**
- * Report clean the task.
+ * Reset report.
*
* @param executionID execution ID
*/
- public void reportClean(final String executionID) {
+ public void reset(final String executionID) {
ShowProcessListManager.getInstance().removeProcessStatement(executionID);
ExecuteProcessContext executeProcessContext = ShowProcessListManager.getInstance().getProcessContext(executionID);
if (null == executeProcessContext) {
return;
}
if (executeProcessContext.isProxyContext()) {
- executeProcessContext.resetExecuteProcessContextToSleep();
+ executeProcessContext.reset();
} else {
ShowProcessListManager.getInstance().removeProcessContext(executionID);
}
}
/**
- * Report remove process context.
+ * Remove process context.
*
* @param executionID execution ID
*/
- public void reportRemove(final String executionID) {
+ public void remove(final String executionID) {
ShowProcessListManager.getInstance().removeProcessStatement(executionID);
ShowProcessListManager.getInstance().removeProcessContext(executionID);
}
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/ExecuteProcessContext.java
index 901be21b0cb..6985d6024fd 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/ExecuteProcessContext.java
@@ -50,22 +50,21 @@ public final class ExecuteProcessContext {
private final Collection<Statement> processStatements = new LinkedList<>();
- private long startTimeMillis = System.currentTimeMillis();
+ private long startMillis = System.currentTimeMillis();
- private ExecuteProcessStatus processStatus;
+ private ExecuteProcessStatus status;
private final boolean proxyContext;
- public ExecuteProcessContext(final String sql, final ExecutionGroupContext<? extends SQLExecutionUnit> executionGroupContext, final ExecuteProcessStatus processStatus,
- final boolean isProxyContext) {
+ public ExecuteProcessContext(final String sql, final ExecutionGroupContext<? extends SQLExecutionUnit> executionGroupContext, final ExecuteProcessStatus status, final boolean isProxyContext) {
this.executionID = executionGroupContext.getReportContext().getExecutionID();
this.sql = sql;
this.databaseName = executionGroupContext.getReportContext().getDatabaseName();
Grantee grantee = executionGroupContext.getReportContext().getGrantee();
this.username = null != grantee ? grantee.getUsername() : null;
this.hostname = null != grantee ? grantee.getHostname() : null;
- this.processStatus = processStatus;
- addProcessUnitsAndStatements(executionGroupContext, processStatus);
+ this.status = status;
+ addProcessUnitsAndStatements(executionGroupContext, status);
proxyContext = isProxyContext;
}
@@ -82,12 +81,12 @@ public final class ExecuteProcessContext {
}
/**
- * Reset execute process context to sleep.
+ * Reset.
*/
- public void resetExecuteProcessContextToSleep() {
- this.sql = "";
- this.startTimeMillis = System.currentTimeMillis();
- this.processStatus = ExecuteProcessStatus.SLEEP;
+ public void reset() {
+ sql = "";
+ startMillis = System.currentTimeMillis();
+ status = ExecuteProcessStatus.SLEEP;
}
}
diff --git a/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/process/model/ExecuteProcessUnit.java b/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/process/model/ExecuteProcessUnit.java
index 782b5fff12b..cce46bc0be4 100644
--- a/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/process/model/ExecuteProcessUnit.java
+++ b/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/process/model/ExecuteProcessUnit.java
@@ -30,10 +30,10 @@ public final class ExecuteProcessUnit {
private final String unitID;
- private volatile ExecuteProcessStatus processStatus;
+ private volatile ExecuteProcessStatus status;
- public ExecuteProcessUnit(final ExecutionUnit executionUnit, final ExecuteProcessStatus processStatus) {
+ public ExecuteProcessUnit(final ExecutionUnit executionUnit, final ExecuteProcessStatus status) {
this.unitID = String.valueOf(executionUnit.hashCode());
- this.processStatus = processStatus;
+ this.status = status;
}
}
diff --git a/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/process/model/yaml/swapper/YamlExecuteProcessContextSwapper.java b/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/process/model/yaml/swapper/YamlExecuteProcessContextSwapper.java
index f736c6533b1..0a1c286c9bc 100644
--- a/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/process/model/yaml/swapper/YamlExecuteProcessContextSwapper.java
+++ b/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/process/model/yaml/swapper/YamlExecuteProcessContextSwapper.java
@@ -39,8 +39,8 @@ public final class YamlExecuteProcessContextSwapper implements YamlConfiguration
result.setHostname(data.getHostname());
result.setSql(data.getSql());
result.setUnitStatuses(data.getProcessUnits().values().stream().map(yamlExecuteProcessUnitSwapper::swapToYamlConfiguration).collect(Collectors.toList()));
- result.setStartTimeMillis(data.getStartTimeMillis());
- result.setProcessStatus(data.getProcessStatus());
+ result.setStartTimeMillis(data.getStartMillis());
+ result.setProcessStatus(data.getStatus());
return result;
}
diff --git a/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/process/model/yaml/swapper/YamlExecuteProcessUnitSwapper.java b/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/process/model/yaml/swapper/YamlExecuteProcessUnitSwapper.java
index d7c881e60cd..7952ec6118f 100644
--- a/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/process/model/yaml/swapper/YamlExecuteProcessUnitSwapper.java
+++ b/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/process/model/yaml/swapper/YamlExecuteProcessUnitSwapper.java
@@ -30,7 +30,7 @@ public final class YamlExecuteProcessUnitSwapper implements YamlConfigurationSwa
public YamlExecuteProcessUnit swapToYamlConfiguration(final ExecuteProcessUnit data) {
YamlExecuteProcessUnit result = new YamlExecuteProcessUnit();
result.setUnitID(data.getUnitID());
- result.setProcessStatus(data.getProcessStatus());
+ result.setProcessStatus(data.getStatus());
return result;
}
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/ExecuteProcessReporterTest.java
index 7b94129965a..4fc55e0e654 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/ExecuteProcessReporterTest.java
@@ -79,7 +79,7 @@ class ExecuteProcessReporterTest {
@Test
void assertReportClean() {
when(showProcessListManager.getProcessContext("foo_id")).thenReturn(mock(ExecuteProcessContext.class));
- new ExecuteProcessReporter().reportClean("foo_id");
+ new ExecuteProcessReporter().reset("foo_id");
verify(showProcessListManager).removeProcessStatement("foo_id");
}
}
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 9099b4741e3..6d625e99e76 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
@@ -82,11 +82,11 @@ public final class ProcessRegistrySubscriber {
.collect(Collectors.toList());
}
- private void sendShowProcessList(final String processListId) {
- List<String> childrenKeys = repository.getChildrenKeys(ProcessNode.getProcessListIdPath(processListId));
+ private void sendShowProcessList(final String showProcessListId) {
+ List<String> childrenKeys = repository.getChildrenKeys(ProcessNode.getProcessListIdPath(showProcessListId));
Collection<String> batchProcessContexts = new LinkedList<>();
for (String each : childrenKeys) {
- batchProcessContexts.add(repository.getDirectly(ProcessNode.getProcessListInstancePath(processListId, each)));
+ batchProcessContexts.add(repository.getDirectly(ProcessNode.getProcessListInstancePath(showProcessListId, each)));
}
eventBusContext.post(new ShowProcessListResponseEvent(batchProcessContexts));
}