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 7cc22179aca Rename ExecuteProcessStatusEnum to ExecuteProcessStatus
(#25379)
7cc22179aca is described below
commit 7cc22179acab886cc9900954114cb3778d9cf701
Author: Liang Zhang <[email protected]>
AuthorDate: Thu Apr 27 23:50:45 2023 +0800
Rename ExecuteProcessStatusEnum to ExecuteProcessStatus (#25379)
---
.../infra/executor/sql/process/ExecuteProcessEngine.java | 6 +++---
.../infra/executor/sql/process/ExecuteProcessReporter.java | 8 ++++----
.../infra/executor/sql/process/model/ExecuteProcessContext.java | 8 ++++----
.../{ExecuteProcessStatusEnum.java => ExecuteProcessStatus.java} | 4 ++--
.../infra/executor/sql/process/model/ExecuteProcessUnit.java | 4 ++--
.../sql/process/model/yaml/YamlExecuteProcessContext.java | 4 ++--
.../executor/sql/process/model/yaml/YamlExecuteProcessUnit.java | 4 ++--
.../infra/executor/sql/process/ExecuteProcessReporterTest.java | 6 +++---
.../model/yaml/swapper/YamlExecuteProcessContextSwapperTest.java | 6 +++---
.../model/yaml/swapper/YamlExecuteProcessUnitSwapperTest.java | 6 +++---
.../mysql/handler/admin/executor/ShowProcessListExecutor.java | 8 ++++----
11 files changed, 32 insertions(+), 32 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 28c2f4b4fe9..8cc62759ab6 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
@@ -21,7 +21,7 @@ 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.ExecuteProcessStatusEnum;
+import
org.apache.shardingsphere.infra.executor.sql.process.model.ExecuteProcessStatus;
import org.apache.shardingsphere.infra.metadata.user.Grantee;
import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;
import
org.apache.shardingsphere.sql.parser.sql.common.statement.ddl.DDLStatement;
@@ -72,7 +72,7 @@ public final class ExecuteProcessEngine {
public void initializeExecution(final ExecutionGroupContext<? extends
SQLExecutionUnit> executionGroupContext, final QueryContext queryContext) {
if
(isMySQLDDLOrDMLStatement(queryContext.getSqlStatementContext().getSqlStatement()))
{
ExecuteIDContext.set(executionGroupContext.getReportContext().getExecutionID());
- reporter.report(queryContext, executionGroupContext,
ExecuteProcessStatusEnum.START);
+ reporter.report(queryContext, executionGroupContext,
ExecuteProcessStatus.START);
}
}
@@ -85,7 +85,7 @@ public final class ExecuteProcessEngine {
if (ExecuteIDContext.isEmpty()) {
return;
}
- reporter.report(ExecuteIDContext.get(), executionUnit,
ExecuteProcessStatusEnum.DONE);
+ reporter.report(ExecuteIDContext.get(), executionUnit,
ExecuteProcessStatus.DONE);
}
/**
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 2263a57af9c..1f1d76b365c 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
@@ -21,7 +21,7 @@ import org.apache.shardingsphere.infra.binder.QueryContext;
import
org.apache.shardingsphere.infra.executor.kernel.model.ExecutionGroupContext;
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.ExecuteProcessStatusEnum;
+import
org.apache.shardingsphere.infra.executor.sql.process.model.ExecuteProcessStatus;
import
org.apache.shardingsphere.infra.executor.sql.process.model.ExecuteProcessUnit;
import java.util.Optional;
@@ -37,7 +37,7 @@ public final class ExecuteProcessReporter {
* @param executionGroupContext execution group context
*/
public void report(final ExecutionGroupContext<? extends SQLExecutionUnit>
executionGroupContext) {
- ExecuteProcessContext executeProcessContext = new
ExecuteProcessContext("", executionGroupContext,
ExecuteProcessStatusEnum.SLEEP, true);
+ ExecuteProcessContext executeProcessContext = new
ExecuteProcessContext("", executionGroupContext, ExecuteProcessStatus.SLEEP,
true);
ShowProcessListManager.getInstance().putProcessContext(executeProcessContext.getExecutionID(),
executeProcessContext);
}
@@ -49,7 +49,7 @@ public final class ExecuteProcessReporter {
* @param processStatus process status
*/
public void report(final QueryContext queryContext, final
ExecutionGroupContext<? extends SQLExecutionUnit> executionGroupContext,
- final ExecuteProcessStatusEnum processStatus) {
+ final ExecuteProcessStatus processStatus) {
ExecuteProcessContext originExecuteProcessContext =
ShowProcessListManager.getInstance().getProcessContext(executionGroupContext.getReportContext().getExecutionID());
boolean isProxyContext = null != originExecuteProcessContext &&
originExecuteProcessContext.isProxyContext();
ExecuteProcessContext executeProcessContext = new
ExecuteProcessContext(queryContext.getSql(), executionGroupContext,
processStatus, isProxyContext);
@@ -64,7 +64,7 @@ public final class ExecuteProcessReporter {
* @param executionUnit execution unit
* @param processStatus process status
*/
- public void report(final String executionID, final SQLExecutionUnit
executionUnit, final ExecuteProcessStatusEnum processStatus) {
+ 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()));
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 50163e1588c..901be21b0cb 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
@@ -52,11 +52,11 @@ public final class ExecuteProcessContext {
private long startTimeMillis = System.currentTimeMillis();
- private ExecuteProcessStatusEnum processStatus;
+ private ExecuteProcessStatus processStatus;
private final boolean proxyContext;
- public ExecuteProcessContext(final String sql, final
ExecutionGroupContext<? extends SQLExecutionUnit> executionGroupContext, final
ExecuteProcessStatusEnum processStatus,
+ public ExecuteProcessContext(final String sql, final
ExecutionGroupContext<? extends SQLExecutionUnit> executionGroupContext, final
ExecuteProcessStatus processStatus,
final boolean isProxyContext) {
this.executionID =
executionGroupContext.getReportContext().getExecutionID();
this.sql = sql;
@@ -69,7 +69,7 @@ public final class ExecuteProcessContext {
proxyContext = isProxyContext;
}
- private void addProcessUnitsAndStatements(final ExecutionGroupContext<?
extends SQLExecutionUnit> executionGroupContext, final ExecuteProcessStatusEnum
processStatus) {
+ private void addProcessUnitsAndStatements(final ExecutionGroupContext<?
extends SQLExecutionUnit> executionGroupContext, final ExecuteProcessStatus
processStatus) {
for (ExecutionGroup<? extends SQLExecutionUnit> each :
executionGroupContext.getInputGroups()) {
for (SQLExecutionUnit executionUnit : each.getInputs()) {
ExecuteProcessUnit processUnit = new
ExecuteProcessUnit(executionUnit.getExecutionUnit(), processStatus);
@@ -87,7 +87,7 @@ public final class ExecuteProcessContext {
public void resetExecuteProcessContextToSleep() {
this.sql = "";
this.startTimeMillis = System.currentTimeMillis();
- this.processStatus = ExecuteProcessStatusEnum.SLEEP;
+ this.processStatus = ExecuteProcessStatus.SLEEP;
}
}
diff --git
a/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/process/model/ExecuteProcessStatusEnum.java
b/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/process/model/ExecuteProcessStatus.java
similarity index 92%
rename from
infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/process/model/ExecuteProcessStatusEnum.java
rename to
infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/process/model/ExecuteProcessStatus.java
index 4f79301283d..36d928144e4 100644
---
a/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/process/model/ExecuteProcessStatusEnum.java
+++
b/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/process/model/ExecuteProcessStatus.java
@@ -18,9 +18,9 @@
package org.apache.shardingsphere.infra.executor.sql.process.model;
/**
- * Execute process status enum.
+ * Execute process status.
*/
-public enum ExecuteProcessStatusEnum {
+public enum ExecuteProcessStatus {
START, DONE, 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 a9156049ed6..782b5fff12b 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,9 +30,9 @@ public final class ExecuteProcessUnit {
private final String unitID;
- private volatile ExecuteProcessStatusEnum processStatus;
+ private volatile ExecuteProcessStatus processStatus;
- public ExecuteProcessUnit(final ExecutionUnit executionUnit, final
ExecuteProcessStatusEnum processStatus) {
+ public ExecuteProcessUnit(final ExecutionUnit executionUnit, final
ExecuteProcessStatus processStatus) {
this.unitID = String.valueOf(executionUnit.hashCode());
this.processStatus = processStatus;
}
diff --git
a/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/process/model/yaml/YamlExecuteProcessContext.java
b/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/process/model/yaml/YamlExecuteProcessContext.java
index 5054216dbec..c961a49ddb5 100644
---
a/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/process/model/yaml/YamlExecuteProcessContext.java
+++
b/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/process/model/yaml/YamlExecuteProcessContext.java
@@ -19,7 +19,7 @@ package
org.apache.shardingsphere.infra.executor.sql.process.model.yaml;
import lombok.Getter;
import lombok.Setter;
-import
org.apache.shardingsphere.infra.executor.sql.process.model.ExecuteProcessStatusEnum;
+import
org.apache.shardingsphere.infra.executor.sql.process.model.ExecuteProcessStatus;
import org.apache.shardingsphere.infra.util.yaml.YamlConfiguration;
import java.util.Collection;
@@ -45,5 +45,5 @@ public final class YamlExecuteProcessContext implements
YamlConfiguration {
private Long startTimeMillis;
- private ExecuteProcessStatusEnum processStatus;
+ private ExecuteProcessStatus processStatus;
}
diff --git
a/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/process/model/yaml/YamlExecuteProcessUnit.java
b/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/process/model/yaml/YamlExecuteProcessUnit.java
index 7429d448296..4ec009d8f41 100644
---
a/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/process/model/yaml/YamlExecuteProcessUnit.java
+++
b/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/process/model/yaml/YamlExecuteProcessUnit.java
@@ -19,7 +19,7 @@ package
org.apache.shardingsphere.infra.executor.sql.process.model.yaml;
import lombok.Getter;
import lombok.Setter;
-import
org.apache.shardingsphere.infra.executor.sql.process.model.ExecuteProcessStatusEnum;
+import
org.apache.shardingsphere.infra.executor.sql.process.model.ExecuteProcessStatus;
import org.apache.shardingsphere.infra.util.yaml.YamlConfiguration;
/**
@@ -31,5 +31,5 @@ public final class YamlExecuteProcessUnit implements
YamlConfiguration {
private String unitID;
- private ExecuteProcessStatusEnum processStatus;
+ private ExecuteProcessStatus processStatus;
}
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 7f91606cec4..7b94129965a 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
@@ -23,7 +23,7 @@ import
org.apache.shardingsphere.infra.executor.kernel.model.ExecutionGroupRepor
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.ExecuteProcessStatusEnum;
+import
org.apache.shardingsphere.infra.executor.sql.process.model.ExecuteProcessStatus;
import org.apache.shardingsphere.test.mock.AutoMockExtension;
import org.apache.shardingsphere.test.mock.StaticMockSettings;
import org.junit.jupiter.api.BeforeEach;
@@ -54,7 +54,7 @@ class ExecuteProcessReporterTest {
@Test
void assertReport() {
ExecutionGroupContext<? extends SQLExecutionUnit>
executionGroupContext = mockExecutionGroupContext();
- new ExecuteProcessReporter().report(new QueryContext(null, null,
null), executionGroupContext, ExecuteProcessStatusEnum.START);
+ new ExecuteProcessReporter().report(new QueryContext(null, null,
null), executionGroupContext, ExecuteProcessStatus.START);
verify(showProcessListManager).putProcessContext(eq(executionGroupContext.getReportContext().getExecutionID()),
any());
}
@@ -72,7 +72,7 @@ class ExecuteProcessReporterTest {
SQLExecutionUnit sqlExecutionUnit = mock(SQLExecutionUnit.class);
when(sqlExecutionUnit.getExecutionUnit()).thenReturn(mock(ExecutionUnit.class));
when(showProcessListManager.getProcessContext("foo_id")).thenReturn(mock(ExecuteProcessContext.class));
- new ExecuteProcessReporter().report("foo_id", sqlExecutionUnit,
ExecuteProcessStatusEnum.DONE);
+ new ExecuteProcessReporter().report("foo_id", sqlExecutionUnit,
ExecuteProcessStatus.DONE);
verify(showProcessListManager).getProcessContext("foo_id");
}
diff --git
a/infra/executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/process/model/yaml/swapper/YamlExecuteProcessContextSwapperTest.java
b/infra/executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/process/model/yaml/swapper/YamlExecuteProcessContextSwapperTest.java
index 172a9c24a18..0ab290212a3 100644
---
a/infra/executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/process/model/yaml/swapper/YamlExecuteProcessContextSwapperTest.java
+++
b/infra/executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/process/model/yaml/swapper/YamlExecuteProcessContextSwapperTest.java
@@ -21,7 +21,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.execute.engine.SQLExecutionUnit;
import
org.apache.shardingsphere.infra.executor.sql.process.model.ExecuteProcessContext;
-import
org.apache.shardingsphere.infra.executor.sql.process.model.ExecuteProcessStatusEnum;
+import
org.apache.shardingsphere.infra.executor.sql.process.model.ExecuteProcessStatus;
import
org.apache.shardingsphere.infra.executor.sql.process.model.yaml.YamlExecuteProcessContext;
import org.apache.shardingsphere.infra.metadata.user.Grantee;
import org.junit.jupiter.api.Test;
@@ -41,7 +41,7 @@ class YamlExecuteProcessContextSwapperTest {
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,
ExecuteProcessStatusEnum.START, true);
+ ExecuteProcessContext executeProcessContext = new
ExecuteProcessContext("SELECT 1", executionGroupContext,
ExecuteProcessStatus.START, true);
YamlExecuteProcessContext actual = new
YamlExecuteProcessContextSwapper().swapToYamlConfiguration(executeProcessContext);
assertNotNull(actual.getExecutionID());
assertThat(actual.getDatabaseName(), is("foo_db"));
@@ -50,7 +50,7 @@ class YamlExecuteProcessContextSwapperTest {
assertThat(actual.getSql(), is("SELECT 1"));
assertTrue(actual.getUnitStatuses().isEmpty());
assertThat(actual.getStartTimeMillis(),
lessThanOrEqualTo(System.currentTimeMillis()));
- assertThat(actual.getProcessStatus(),
is(ExecuteProcessStatusEnum.START));
+ assertThat(actual.getProcessStatus(), is(ExecuteProcessStatus.START));
}
@Test
diff --git
a/infra/executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/process/model/yaml/swapper/YamlExecuteProcessUnitSwapperTest.java
b/infra/executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/process/model/yaml/swapper/YamlExecuteProcessUnitSwapperTest.java
index 95aed85801f..326f85cfc4e 100644
---
a/infra/executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/process/model/yaml/swapper/YamlExecuteProcessUnitSwapperTest.java
+++
b/infra/executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/process/model/yaml/swapper/YamlExecuteProcessUnitSwapperTest.java
@@ -19,7 +19,7 @@ package
org.apache.shardingsphere.infra.executor.sql.process.model.yaml.swapper;
import org.apache.shardingsphere.infra.executor.sql.context.ExecutionUnit;
import org.apache.shardingsphere.infra.executor.sql.context.SQLUnit;
-import
org.apache.shardingsphere.infra.executor.sql.process.model.ExecuteProcessStatusEnum;
+import
org.apache.shardingsphere.infra.executor.sql.process.model.ExecuteProcessStatus;
import
org.apache.shardingsphere.infra.executor.sql.process.model.ExecuteProcessUnit;
import
org.apache.shardingsphere.infra.executor.sql.process.model.yaml.YamlExecuteProcessUnit;
import org.junit.jupiter.api.Test;
@@ -35,10 +35,10 @@ class YamlExecuteProcessUnitSwapperTest {
@Test
void assertSwapToYamlConfiguration() {
- ExecuteProcessUnit executeProcessUnit = new ExecuteProcessUnit(new
ExecutionUnit("foo_ds", new SQLUnit("SELECT 1", Collections.emptyList())),
ExecuteProcessStatusEnum.START);
+ ExecuteProcessUnit executeProcessUnit = new ExecuteProcessUnit(new
ExecutionUnit("foo_ds", new SQLUnit("SELECT 1", Collections.emptyList())),
ExecuteProcessStatus.START);
YamlExecuteProcessUnit actual = new
YamlExecuteProcessUnitSwapper().swapToYamlConfiguration(executeProcessUnit);
assertNotNull(actual.getUnitID());
- assertThat(actual.getProcessStatus(),
is(ExecuteProcessStatusEnum.START));
+ assertThat(actual.getProcessStatus(), is(ExecuteProcessStatus.START));
}
@Test
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 eafb7d184c6..0b1880097b7 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,7 +25,7 @@ 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.model.ExecuteProcessStatusEnum;
+import
org.apache.shardingsphere.infra.executor.sql.process.model.ExecuteProcessStatus;
import
org.apache.shardingsphere.infra.executor.sql.process.model.yaml.BatchYamlExecuteProcessContext;
import
org.apache.shardingsphere.infra.executor.sql.process.model.yaml.YamlExecuteProcessContext;
import org.apache.shardingsphere.infra.merge.result.MergedResult;
@@ -99,13 +99,13 @@ public final class ShowProcessListExecutor implements
DatabaseAdminQueryExecutor
rowValues.add(processContext.getUsername());
rowValues.add(processContext.getHostname());
rowValues.add(processContext.getDatabaseName());
- rowValues.add(ExecuteProcessStatusEnum.SLEEP ==
processContext.getProcessStatus() ? "Sleep" : "Execute");
+ rowValues.add(ExecuteProcessStatus.SLEEP ==
processContext.getProcessStatus() ? "Sleep" : "Execute");
rowValues.add(TimeUnit.MILLISECONDS.toSeconds(System.currentTimeMillis() -
processContext.getStartTimeMillis()));
String sql = null;
- if (ExecuteProcessStatusEnum.SLEEP ==
processContext.getProcessStatus()) {
+ if (ExecuteProcessStatus.SLEEP == processContext.getProcessStatus()) {
rowValues.add("");
} else {
- int processDoneCount =
processContext.getUnitStatuses().stream().map(each ->
ExecuteProcessStatusEnum.DONE == each.getProcessStatus() ? 1 : 0).reduce(0,
Integer::sum);
+ int processDoneCount =
processContext.getUnitStatuses().stream().map(each -> ExecuteProcessStatus.DONE
== each.getProcessStatus() ? 1 : 0).reduce(0, Integer::sum);
String statePrefix = "Executing ";
rowValues.add(statePrefix + processDoneCount + "/" +
processContext.getUnitStatuses().size());
sql = processContext.getSql();