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 2022/11/27 15:28:45 UTC
[shardingsphere] branch master updated: Refactor DefaultParallelRunnerExecutorFactory (#22464)
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 b947be7f9f1 Refactor DefaultParallelRunnerExecutorFactory (#22464)
b947be7f9f1 is described below
commit b947be7f9f1854db40685129f78317016d80463f
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Sun Nov 27 23:28:38 2022 +0800
Refactor DefaultParallelRunnerExecutorFactory (#22464)
* Refactor DefaultParallelRunnerExecutorFactory
* Rename ParallelRunningStrategy
* Fix checkstyle issue
---
.../test/integration/engine/dal/GeneralDALIT.java | 4 +--
.../test/integration/engine/dcl/GeneralDCLIT.java | 4 +--
.../test/integration/engine/ddl/GeneralDDLIT.java | 4 +--
.../integration/engine/dml/AdditionalDMLIT.java | 4 +--
.../test/integration/engine/dml/BatchDMLIT.java | 4 +--
.../test/integration/engine/dml/GeneralDMLIT.java | 4 +--
.../integration/engine/dql/AdditionalDQLIT.java | 4 +--
.../test/integration/engine/dql/GeneralDQLIT.java | 4 +--
.../test/integration/engine/ral/GeneralRALIT.java | 4 +--
.../test/integration/engine/rdl/GeneralRDLIT.java | 4 +--
.../test/integration/engine/rql/GeneralRQLIT.java | 4 +--
...ShardingSphereIntegrationTestParameterized.java | 8 ++---
.../impl/ScenarioParallelRunnerExecutor.java | 2 +-
.../ShardingSphereParallelTestParameterized.java | 6 ++--
...eStrategy.java => ParallelRunningStrategy.java} | 4 +--
.../DefaultParallelRunnerExecutorFactory.java | 39 +++++++++-------------
.../impl/DefaultParallelRunnerExecutor.java | 36 ++++++++------------
.../runner/scheduler/ParallelRunnerScheduler.java | 2 +-
18 files changed, 62 insertions(+), 79 deletions(-)
diff --git a/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dal/GeneralDALIT.java b/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dal/GeneralDALIT.java
index 61aac5e8d13..c824c4ff950 100644
--- a/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dal/GeneralDALIT.java
+++ b/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dal/GeneralDALIT.java
@@ -21,7 +21,7 @@ import org.apache.shardingsphere.test.integration.cases.SQLCommandType;
import org.apache.shardingsphere.test.integration.framework.param.array.ParameterizedArrayFactory;
import org.apache.shardingsphere.test.integration.framework.param.model.AssertionParameterizedArray;
import org.apache.shardingsphere.test.runner.annotaion.ParallelLevel;
-import org.apache.shardingsphere.test.runner.annotaion.ParallelRuntimeStrategy;
+import org.apache.shardingsphere.test.runner.annotaion.ParallelRunningStrategy;
import org.junit.Test;
import org.junit.runners.Parameterized.Parameters;
@@ -32,7 +32,7 @@ import java.sql.Statement;
import java.text.ParseException;
import java.util.Collection;
-@ParallelRuntimeStrategy(ParallelLevel.SCENARIO)
+@ParallelRunningStrategy(ParallelLevel.SCENARIO)
public final class GeneralDALIT extends BaseDALIT {
public GeneralDALIT(final AssertionParameterizedArray parameterizedArray) {
diff --git a/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dcl/GeneralDCLIT.java b/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dcl/GeneralDCLIT.java
index 009c9077d05..cd95f8f20a2 100644
--- a/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dcl/GeneralDCLIT.java
+++ b/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dcl/GeneralDCLIT.java
@@ -22,7 +22,7 @@ import org.apache.shardingsphere.test.integration.cases.SQLExecuteType;
import org.apache.shardingsphere.test.integration.framework.param.array.ParameterizedArrayFactory;
import org.apache.shardingsphere.test.integration.framework.param.model.AssertionParameterizedArray;
import org.apache.shardingsphere.test.runner.annotaion.ParallelLevel;
-import org.apache.shardingsphere.test.runner.annotaion.ParallelRuntimeStrategy;
+import org.apache.shardingsphere.test.runner.annotaion.ParallelRunningStrategy;
import org.junit.Test;
import org.junit.runners.Parameterized.Parameters;
@@ -33,7 +33,7 @@ import java.sql.Statement;
import java.text.ParseException;
import java.util.Collection;
-@ParallelRuntimeStrategy(ParallelLevel.SCENARIO)
+@ParallelRunningStrategy(ParallelLevel.SCENARIO)
public final class GeneralDCLIT extends BaseDCLIT {
public GeneralDCLIT(final AssertionParameterizedArray parameterizedArray) {
diff --git a/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/ddl/GeneralDDLIT.java b/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/ddl/GeneralDDLIT.java
index 4877f0288e3..eadff27ef5a 100644
--- a/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/ddl/GeneralDDLIT.java
+++ b/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/ddl/GeneralDDLIT.java
@@ -22,7 +22,7 @@ import org.apache.shardingsphere.test.integration.cases.SQLExecuteType;
import org.apache.shardingsphere.test.integration.framework.param.array.ParameterizedArrayFactory;
import org.apache.shardingsphere.test.integration.framework.param.model.AssertionParameterizedArray;
import org.apache.shardingsphere.test.runner.annotaion.ParallelLevel;
-import org.apache.shardingsphere.test.runner.annotaion.ParallelRuntimeStrategy;
+import org.apache.shardingsphere.test.runner.annotaion.ParallelRunningStrategy;
import org.junit.Test;
import org.junit.runners.Parameterized.Parameters;
@@ -35,7 +35,7 @@ import java.util.Collection;
import static org.junit.Assert.assertFalse;
-@ParallelRuntimeStrategy(ParallelLevel.SCENARIO)
+@ParallelRunningStrategy(ParallelLevel.SCENARIO)
public final class GeneralDDLIT extends BaseDDLIT {
public GeneralDDLIT(final AssertionParameterizedArray parameterizedArray) {
diff --git a/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dml/AdditionalDMLIT.java b/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dml/AdditionalDMLIT.java
index f1a983210ff..9b57002a6a7 100644
--- a/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dml/AdditionalDMLIT.java
+++ b/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dml/AdditionalDMLIT.java
@@ -24,7 +24,7 @@ import org.apache.shardingsphere.test.integration.env.runtime.IntegrationTestEnv
import org.apache.shardingsphere.test.integration.framework.param.array.ParameterizedArrayFactory;
import org.apache.shardingsphere.test.integration.framework.param.model.AssertionParameterizedArray;
import org.apache.shardingsphere.test.runner.annotaion.ParallelLevel;
-import org.apache.shardingsphere.test.runner.annotaion.ParallelRuntimeStrategy;
+import org.apache.shardingsphere.test.runner.annotaion.ParallelRunningStrategy;
import org.junit.Test;
import org.junit.runners.Parameterized.Parameters;
@@ -38,7 +38,7 @@ import java.util.Collections;
import static org.junit.Assert.assertFalse;
-@ParallelRuntimeStrategy(ParallelLevel.SCENARIO)
+@ParallelRunningStrategy(ParallelLevel.SCENARIO)
public final class AdditionalDMLIT extends BaseDMLIT {
public AdditionalDMLIT(final AssertionParameterizedArray parameterizedArray) {
diff --git a/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dml/BatchDMLIT.java b/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dml/BatchDMLIT.java
index 899bb74cc2d..d8651af1487 100644
--- a/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dml/BatchDMLIT.java
+++ b/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dml/BatchDMLIT.java
@@ -25,7 +25,7 @@ import org.apache.shardingsphere.test.integration.framework.param.array.Paramete
import org.apache.shardingsphere.test.integration.framework.param.model.CaseParameterizedArray;
import org.apache.shardingsphere.test.integration.framework.param.model.ParameterizedArray;
import org.apache.shardingsphere.test.runner.annotaion.ParallelLevel;
-import org.apache.shardingsphere.test.runner.annotaion.ParallelRuntimeStrategy;
+import org.apache.shardingsphere.test.runner.annotaion.ParallelRunningStrategy;
import org.junit.Test;
import org.junit.runners.Parameterized.Parameters;
@@ -38,7 +38,7 @@ import java.util.Collection;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-@ParallelRuntimeStrategy(ParallelLevel.SCENARIO)
+@ParallelRunningStrategy(ParallelLevel.SCENARIO)
public final class BatchDMLIT extends BatchITCase {
public BatchDMLIT(final CaseParameterizedArray parameterizedArray) {
diff --git a/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dml/GeneralDMLIT.java b/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dml/GeneralDMLIT.java
index 8b87866beb5..84a8a27ad10 100644
--- a/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dml/GeneralDMLIT.java
+++ b/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dml/GeneralDMLIT.java
@@ -23,7 +23,7 @@ import org.apache.shardingsphere.test.integration.cases.value.SQLValue;
import org.apache.shardingsphere.test.integration.framework.param.array.ParameterizedArrayFactory;
import org.apache.shardingsphere.test.integration.framework.param.model.AssertionParameterizedArray;
import org.apache.shardingsphere.test.runner.annotaion.ParallelLevel;
-import org.apache.shardingsphere.test.runner.annotaion.ParallelRuntimeStrategy;
+import org.apache.shardingsphere.test.runner.annotaion.ParallelRunningStrategy;
import org.junit.Test;
import org.junit.runners.Parameterized.Parameters;
@@ -36,7 +36,7 @@ import java.util.Collection;
import static org.junit.Assert.assertFalse;
-@ParallelRuntimeStrategy(ParallelLevel.SCENARIO)
+@ParallelRunningStrategy(ParallelLevel.SCENARIO)
public final class GeneralDMLIT extends BaseDMLIT {
public GeneralDMLIT(final AssertionParameterizedArray parameterizedArray) {
diff --git a/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dql/AdditionalDQLIT.java b/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dql/AdditionalDQLIT.java
index 16b5811a350..87929493c8e 100644
--- a/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dql/AdditionalDQLIT.java
+++ b/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dql/AdditionalDQLIT.java
@@ -24,7 +24,7 @@ import org.apache.shardingsphere.test.integration.env.runtime.IntegrationTestEnv
import org.apache.shardingsphere.test.integration.framework.param.array.ParameterizedArrayFactory;
import org.apache.shardingsphere.test.integration.framework.param.model.AssertionParameterizedArray;
import org.apache.shardingsphere.test.runner.annotaion.ParallelLevel;
-import org.apache.shardingsphere.test.runner.annotaion.ParallelRuntimeStrategy;
+import org.apache.shardingsphere.test.runner.annotaion.ParallelRunningStrategy;
import org.junit.Test;
import org.junit.runners.Parameterized.Parameters;
@@ -39,7 +39,7 @@ import java.util.Collections;
import static org.junit.Assert.assertTrue;
-@ParallelRuntimeStrategy(ParallelLevel.CASE)
+@ParallelRunningStrategy(ParallelLevel.CASE)
public final class AdditionalDQLIT extends BaseDQLIT {
public AdditionalDQLIT(final AssertionParameterizedArray parameterizedArray) {
diff --git a/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dql/GeneralDQLIT.java b/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dql/GeneralDQLIT.java
index 14ae2ab8a92..dfcd30d91b2 100644
--- a/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dql/GeneralDQLIT.java
+++ b/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dql/GeneralDQLIT.java
@@ -23,7 +23,7 @@ import org.apache.shardingsphere.test.integration.cases.value.SQLValue;
import org.apache.shardingsphere.test.integration.framework.param.array.ParameterizedArrayFactory;
import org.apache.shardingsphere.test.integration.framework.param.model.AssertionParameterizedArray;
import org.apache.shardingsphere.test.runner.annotaion.ParallelLevel;
-import org.apache.shardingsphere.test.runner.annotaion.ParallelRuntimeStrategy;
+import org.apache.shardingsphere.test.runner.annotaion.ParallelRunningStrategy;
import org.junit.Test;
import org.junit.runners.Parameterized.Parameters;
@@ -37,7 +37,7 @@ import java.util.Collection;
import static org.junit.Assert.assertTrue;
-@ParallelRuntimeStrategy(ParallelLevel.CASE)
+@ParallelRunningStrategy(ParallelLevel.CASE)
public final class GeneralDQLIT extends BaseDQLIT {
public GeneralDQLIT(final AssertionParameterizedArray parameterizedArray) {
diff --git a/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/ral/GeneralRALIT.java b/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/ral/GeneralRALIT.java
index 0e9101860dd..a078d7c5fda 100644
--- a/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/ral/GeneralRALIT.java
+++ b/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/ral/GeneralRALIT.java
@@ -21,7 +21,7 @@ import org.apache.shardingsphere.test.integration.cases.SQLCommandType;
import org.apache.shardingsphere.test.integration.framework.param.array.ParameterizedArrayFactory;
import org.apache.shardingsphere.test.integration.framework.param.model.AssertionParameterizedArray;
import org.apache.shardingsphere.test.runner.annotaion.ParallelLevel;
-import org.apache.shardingsphere.test.runner.annotaion.ParallelRuntimeStrategy;
+import org.apache.shardingsphere.test.runner.annotaion.ParallelRunningStrategy;
import org.junit.Test;
import org.junit.runners.Parameterized.Parameters;
@@ -32,7 +32,7 @@ import java.sql.Statement;
import java.text.ParseException;
import java.util.Collection;
-@ParallelRuntimeStrategy(ParallelLevel.SCENARIO)
+@ParallelRunningStrategy(ParallelLevel.SCENARIO)
public final class GeneralRALIT extends BaseRALIT {
public GeneralRALIT(final AssertionParameterizedArray parameterizedArray) {
diff --git a/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/rdl/GeneralRDLIT.java b/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/rdl/GeneralRDLIT.java
index d175890bd9a..41a3d0df577 100644
--- a/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/rdl/GeneralRDLIT.java
+++ b/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/rdl/GeneralRDLIT.java
@@ -21,7 +21,7 @@ import org.apache.shardingsphere.test.integration.cases.SQLCommandType;
import org.apache.shardingsphere.test.integration.framework.param.array.ParameterizedArrayFactory;
import org.apache.shardingsphere.test.integration.framework.param.model.AssertionParameterizedArray;
import org.apache.shardingsphere.test.runner.annotaion.ParallelLevel;
-import org.apache.shardingsphere.test.runner.annotaion.ParallelRuntimeStrategy;
+import org.apache.shardingsphere.test.runner.annotaion.ParallelRunningStrategy;
import org.junit.Test;
import org.junit.runners.Parameterized.Parameters;
@@ -34,7 +34,7 @@ import java.util.Collection;
import static org.junit.Assert.assertNotNull;
-@ParallelRuntimeStrategy(ParallelLevel.SCENARIO)
+@ParallelRunningStrategy(ParallelLevel.SCENARIO)
public final class GeneralRDLIT extends BaseRDLIT {
public GeneralRDLIT(final AssertionParameterizedArray parameterizedArray) {
diff --git a/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/rql/GeneralRQLIT.java b/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/rql/GeneralRQLIT.java
index db775c7d644..62ef20cefa5 100644
--- a/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/rql/GeneralRQLIT.java
+++ b/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/rql/GeneralRQLIT.java
@@ -21,7 +21,7 @@ import org.apache.shardingsphere.test.integration.cases.SQLCommandType;
import org.apache.shardingsphere.test.integration.framework.param.array.ParameterizedArrayFactory;
import org.apache.shardingsphere.test.integration.framework.param.model.AssertionParameterizedArray;
import org.apache.shardingsphere.test.runner.annotaion.ParallelLevel;
-import org.apache.shardingsphere.test.runner.annotaion.ParallelRuntimeStrategy;
+import org.apache.shardingsphere.test.runner.annotaion.ParallelRunningStrategy;
import org.junit.Test;
import org.junit.runners.Parameterized.Parameters;
@@ -32,7 +32,7 @@ import java.sql.Statement;
import java.text.ParseException;
import java.util.Collection;
-@ParallelRuntimeStrategy(ParallelLevel.CASE)
+@ParallelRunningStrategy(ParallelLevel.CASE)
public final class GeneralRQLIT extends BaseRQLIT {
public GeneralRQLIT(final AssertionParameterizedArray parameterizedArray) {
diff --git a/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/runner/ShardingSphereIntegrationTestParameterized.java b/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/runner/ShardingSphereIntegrationTestParameterized.java
index a27d97bb236..7d55a2c30fc 100644
--- a/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/runner/ShardingSphereIntegrationTestParameterized.java
+++ b/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/runner/ShardingSphereIntegrationTestParameterized.java
@@ -21,7 +21,7 @@ import org.apache.shardingsphere.test.integration.env.runtime.IntegrationTestEnv
import org.apache.shardingsphere.test.integration.env.runtime.cluster.ClusterEnvironment;
import org.apache.shardingsphere.test.integration.framework.runner.parallel.DatabaseTypeParallelRunnerExecutorFactory;
import org.apache.shardingsphere.test.integration.framework.runner.parallel.ParameterizedParallelRunnerScheduler;
-import org.apache.shardingsphere.test.runner.annotaion.ParallelRuntimeStrategy;
+import org.apache.shardingsphere.test.runner.annotaion.ParallelRunningStrategy;
import org.junit.runners.Parameterized;
/**
@@ -34,9 +34,9 @@ public final class ShardingSphereIntegrationTestParameterized extends Parameteri
// CHECKSTYLE:ON
super(clazz);
if (ClusterEnvironment.Type.DOCKER != IntegrationTestEnvironment.getInstance().getClusterEnvironment().getType()) {
- ParallelRuntimeStrategy parallelRuntimeStrategy = clazz.getAnnotation(ParallelRuntimeStrategy.class);
- if (null != parallelRuntimeStrategy) {
- setScheduler(new ParameterizedParallelRunnerScheduler(parallelRuntimeStrategy.value(), new DatabaseTypeParallelRunnerExecutorFactory()));
+ ParallelRunningStrategy parallelRunningStrategy = clazz.getAnnotation(ParallelRunningStrategy.class);
+ if (null != parallelRunningStrategy) {
+ setScheduler(new ParameterizedParallelRunnerScheduler(parallelRunningStrategy.value(), new DatabaseTypeParallelRunnerExecutorFactory()));
}
}
}
diff --git a/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/runner/parallel/impl/ScenarioParallelRunnerExecutor.java b/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/runner/parallel/impl/ScenarioParallelRunnerExecutor.java
index a4339dc5637..4f3cf7bf177 100644
--- a/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/runner/parallel/impl/ScenarioParallelRunnerExecutor.java
+++ b/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/runner/parallel/impl/ScenarioParallelRunnerExecutor.java
@@ -30,7 +30,7 @@ import java.util.concurrent.Executors;
public final class ScenarioParallelRunnerExecutor extends DefaultParallelRunnerExecutor<ParameterizedArray> {
@Override
- public ExecutorService getExecutorService(final ParameterizedArray key) {
+ protected ExecutorService getExecutorService(final ParameterizedArray key) {
ScenarioKey scenarioKey = new ScenarioKey(key);
if (getExecutorServiceMap().containsKey(scenarioKey)) {
return getExecutorServiceMap().get(scenarioKey);
diff --git a/test/runner/src/main/java/org/apache/shardingsphere/test/runner/ShardingSphereParallelTestParameterized.java b/test/runner/src/main/java/org/apache/shardingsphere/test/runner/ShardingSphereParallelTestParameterized.java
index 990b1fd0c84..9d5598084b8 100644
--- a/test/runner/src/main/java/org/apache/shardingsphere/test/runner/ShardingSphereParallelTestParameterized.java
+++ b/test/runner/src/main/java/org/apache/shardingsphere/test/runner/ShardingSphereParallelTestParameterized.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.test.runner;
import org.apache.shardingsphere.test.runner.annotaion.ParallelLevel;
-import org.apache.shardingsphere.test.runner.annotaion.ParallelRuntimeStrategy;
+import org.apache.shardingsphere.test.runner.annotaion.ParallelRunningStrategy;
import org.apache.shardingsphere.test.runner.executor.DefaultParallelRunnerExecutorFactory;
import org.apache.shardingsphere.test.runner.scheduler.ParallelRunnerScheduler;
import org.junit.runners.Parameterized;
@@ -36,7 +36,7 @@ public final class ShardingSphereParallelTestParameterized extends Parameterized
}
private ParallelLevel getParallelLevel(final Class<?> clazz) {
- ParallelRuntimeStrategy parallelRuntimeStrategy = clazz.getAnnotation(ParallelRuntimeStrategy.class);
- return null == parallelRuntimeStrategy ? ParallelLevel.DEFAULT : parallelRuntimeStrategy.value();
+ ParallelRunningStrategy strategy = clazz.getAnnotation(ParallelRunningStrategy.class);
+ return null == strategy ? ParallelLevel.DEFAULT : strategy.value();
}
}
diff --git a/test/runner/src/main/java/org/apache/shardingsphere/test/runner/annotaion/ParallelRuntimeStrategy.java b/test/runner/src/main/java/org/apache/shardingsphere/test/runner/annotaion/ParallelRunningStrategy.java
similarity index 94%
rename from test/runner/src/main/java/org/apache/shardingsphere/test/runner/annotaion/ParallelRuntimeStrategy.java
rename to test/runner/src/main/java/org/apache/shardingsphere/test/runner/annotaion/ParallelRunningStrategy.java
index 029ac8f4047..892d0ef32cc 100644
--- a/test/runner/src/main/java/org/apache/shardingsphere/test/runner/annotaion/ParallelRuntimeStrategy.java
+++ b/test/runner/src/main/java/org/apache/shardingsphere/test/runner/annotaion/ParallelRunningStrategy.java
@@ -25,13 +25,13 @@ import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
/**
- * Parallel runtime strategy.
+ * Parallel running strategy.
*/
@Documented
@Target(ElementType.TYPE)
@Retention(RetentionPolicy.RUNTIME)
@Inherited
-public @interface ParallelRuntimeStrategy {
+public @interface ParallelRunningStrategy {
/**
* Get parallel level.
diff --git a/test/runner/src/main/java/org/apache/shardingsphere/test/runner/executor/DefaultParallelRunnerExecutorFactory.java b/test/runner/src/main/java/org/apache/shardingsphere/test/runner/executor/DefaultParallelRunnerExecutorFactory.java
index dbec8e401a6..1253490b65a 100644
--- a/test/runner/src/main/java/org/apache/shardingsphere/test/runner/executor/DefaultParallelRunnerExecutorFactory.java
+++ b/test/runner/src/main/java/org/apache/shardingsphere/test/runner/executor/DefaultParallelRunnerExecutorFactory.java
@@ -34,8 +34,18 @@ public class DefaultParallelRunnerExecutorFactory<T> implements ParallelRunnerEx
private volatile ParallelRunnerExecutor defaultExecutor;
+ /**
+ * Create executor instance by parallel level.
+ *
+ * @param parallelLevel parallel level
+ * @return executor by parallel level
+ */
+ public ParallelRunnerExecutor newInstance(final ParallelLevel parallelLevel) {
+ return new DefaultParallelRunnerExecutor();
+ }
+
@Override
- public ParallelRunnerExecutor getExecutor(final T key, final ParallelLevel parallelLevel) {
+ public final ParallelRunnerExecutor getExecutor(final T key, final ParallelLevel parallelLevel) {
if (executors.containsKey(key)) {
return executors.get(key);
}
@@ -46,13 +56,8 @@ public class DefaultParallelRunnerExecutorFactory<T> implements ParallelRunnerEx
return executors.get(key);
}
- /**
- * Get parallel runner executor.
- *
- * @param parallelLevel parallel level
- * @return parallel runner executor
- */
- public ParallelRunnerExecutor getExecutor(final ParallelLevel parallelLevel) {
+ @Override
+ public final ParallelRunnerExecutor getExecutor(final ParallelLevel parallelLevel) {
if (null == defaultExecutor) {
synchronized (DefaultParallelRunnerExecutorFactory.class) {
if (null == defaultExecutor) {
@@ -63,22 +68,8 @@ public class DefaultParallelRunnerExecutorFactory<T> implements ParallelRunnerEx
return defaultExecutor;
}
- /**
- * Create executor instance by parallel level.
- *
- * @param parallelLevel parallel level
- * @return executor by parallel level
- */
- public ParallelRunnerExecutor newInstance(final ParallelLevel parallelLevel) {
- return new DefaultParallelRunnerExecutor();
- }
-
- /**
- * Get all executors.
- *
- * @return all executors
- */
- public Collection<ParallelRunnerExecutor> getAllExecutors() {
+ @Override
+ public final Collection<ParallelRunnerExecutor> getAllExecutors() {
Collection<ParallelRunnerExecutor> result = new LinkedList<>(executors.values());
if (null != defaultExecutor) {
result.add(defaultExecutor);
diff --git a/test/runner/src/main/java/org/apache/shardingsphere/test/runner/executor/impl/DefaultParallelRunnerExecutor.java b/test/runner/src/main/java/org/apache/shardingsphere/test/runner/executor/impl/DefaultParallelRunnerExecutor.java
index 8dcb60494e7..75ea7b61389 100644
--- a/test/runner/src/main/java/org/apache/shardingsphere/test/runner/executor/impl/DefaultParallelRunnerExecutor.java
+++ b/test/runner/src/main/java/org/apache/shardingsphere/test/runner/executor/impl/DefaultParallelRunnerExecutor.java
@@ -53,39 +53,31 @@ public class DefaultParallelRunnerExecutor<T> implements ParallelRunnerExecutor<
taskFeatures.add(getExecutorService().submit(childStatement));
}
- private ExecutorService getExecutorService() {
- if (null == defaultExecutorService) {
- synchronized (DefaultParallelRunnerExecutor.class) {
- if (null == defaultExecutorService) {
- defaultExecutorService = Executors.newFixedThreadPool(
- Runtime.getRuntime().availableProcessors(),
- new ThreadFactoryBuilder().setDaemon(true).setNameFormat("ShardingSphere-ParallelTestThread-%d").build());
- }
- }
- }
- return defaultExecutorService;
- }
-
- /**
- * Get executor service by key.
- *
- * @param key key bind to the executor service
- * @return executor service
- */
- public ExecutorService getExecutorService(final T key) {
+ protected ExecutorService getExecutorService(final T key) {
if (executorServiceMap.containsKey(key)) {
return executorServiceMap.get(key);
}
String threadPoolNameFormat = String.join("-", "ShardingSphere-KeyedParallelTestThread", key.toString(), "%d");
ExecutorService executorService = Executors.newFixedThreadPool(
- Runtime.getRuntime().availableProcessors(),
- new ThreadFactoryBuilder().setDaemon(true).setNameFormat(threadPoolNameFormat).build());
+ Runtime.getRuntime().availableProcessors(), new ThreadFactoryBuilder().setDaemon(true).setNameFormat(threadPoolNameFormat).build());
if (null != executorServiceMap.putIfAbsent(key, executorService)) {
executorService.shutdownNow();
}
return executorServiceMap.get(key);
}
+ private ExecutorService getExecutorService() {
+ if (null == defaultExecutorService) {
+ synchronized (DefaultParallelRunnerExecutor.class) {
+ if (null == defaultExecutorService) {
+ defaultExecutorService = Executors.newFixedThreadPool(
+ Runtime.getRuntime().availableProcessors(), new ThreadFactoryBuilder().setDaemon(true).setNameFormat("ShardingSphere-ParallelTestThread-%d").build());
+ }
+ }
+ }
+ return defaultExecutorService;
+ }
+
@Override
public void finished() {
taskFeatures.forEach(each -> {
diff --git a/test/runner/src/main/java/org/apache/shardingsphere/test/runner/scheduler/ParallelRunnerScheduler.java b/test/runner/src/main/java/org/apache/shardingsphere/test/runner/scheduler/ParallelRunnerScheduler.java
index 523fcbab8a2..0e07ceff35e 100644
--- a/test/runner/src/main/java/org/apache/shardingsphere/test/runner/scheduler/ParallelRunnerScheduler.java
+++ b/test/runner/src/main/java/org/apache/shardingsphere/test/runner/scheduler/ParallelRunnerScheduler.java
@@ -41,7 +41,7 @@ public class ParallelRunnerScheduler implements RunnerScheduler {
}
@Override
- public void finished() {
+ public final void finished() {
executorFactory.getAllExecutors().forEach(each -> ((ParallelRunnerExecutor) each).finished());
}
}