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 79e3ce99a44 Rename NormalParallelRunnerExecutor (#22511)
79e3ce99a44 is described below
commit 79e3ce99a44a641ca01a8382648a323982382b39
Author: Liang Zhang <[email protected]>
AuthorDate: Tue Nov 29 23:28:07 2022 +0800
Rename NormalParallelRunnerExecutor (#22511)
* Rename NormalParallelRunnerExecutor
---
.../parallel/ParameterizedParallelRunnerScheduler.java | 2 +-
.../runner/parallel/impl/CaseParallelRunnerExecutor.java | 7 +++----
.../runner/parallel/impl/ScenarioParallelRunnerExecutor.java | 8 ++++----
.../shardingsphere/test/runner/ParallelParameterized.java | 2 +-
.../test/runner/executor/ParallelRunnerExecutor.java | 5 +++--
.../test/runner/executor/ParallelRunnerExecutors.java | 11 ++++-------
...RunnerExecutor.java => NormalParallelRunnerExecutor.java} | 12 +++++-------
...hardingsphere.test.runner.executor.ParallelRunnerExecutor | 2 +-
8 files changed, 22 insertions(+), 27 deletions(-)
diff --git
a/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/runner/parallel/ParameterizedParallelRunnerScheduler.java
b/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/runner/parallel/ParameterizedParallelRunnerScheduler.java
index b2289e7ade3..91fe077279f 100644
---
a/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/runner/parallel/ParameterizedParallelRunnerScheduler.java
+++
b/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/runner/parallel/ParameterizedParallelRunnerScheduler.java
@@ -35,6 +35,6 @@ public final class ParameterizedParallelRunnerScheduler
extends ParallelRunnerSc
@Override
public void schedule(final Runnable childStatement) {
ITParameterizedArray parameterizedArray = (ITParameterizedArray) new
RunnerParameters(childStatement).getParameterizedArray();
- getExecutorEngine().getExecutor(parameterizedArray.getDatabaseType(),
getParallelLevel()).execute(parameterizedArray, childStatement);
+
getExecutorEngine().getExecutor(parameterizedArray.getDatabaseType().getType(),
getParallelLevel()).execute(parameterizedArray, childStatement);
}
}
diff --git
a/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/runner/parallel/impl/CaseParallelRunnerExecutor.java
b/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/runner/parallel/impl/CaseParallelRunnerExecutor.java
index 5a47dc1c909..9abb856c8e7 100644
---
a/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/runner/parallel/impl/CaseParallelRunnerExecutor.java
+++
b/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/runner/parallel/impl/CaseParallelRunnerExecutor.java
@@ -17,17 +17,16 @@
package
org.apache.shardingsphere.test.integration.framework.runner.parallel.impl;
-import
org.apache.shardingsphere.test.integration.framework.param.model.ITParameterizedArray;
import
org.apache.shardingsphere.test.runner.ParallelRunningStrategy.ParallelLevel;
-import
org.apache.shardingsphere.test.runner.executor.impl.DefaultParallelRunnerExecutor;
+import
org.apache.shardingsphere.test.runner.executor.impl.NormalParallelRunnerExecutor;
/**
* Parallel runner executor with case.
*/
-public final class CaseParallelRunnerExecutor extends
DefaultParallelRunnerExecutor<ITParameterizedArray> {
+public final class CaseParallelRunnerExecutor extends
NormalParallelRunnerExecutor {
@Override
- public void execute(final ITParameterizedArray parameterizedArray, final
Runnable childStatement) {
+ public void execute(final Object parameterizedArray, final Runnable
childStatement) {
execute(childStatement);
}
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 a29545a1ebb..99548bff1a1 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
@@ -21,18 +21,18 @@ import
com.google.common.util.concurrent.ThreadFactoryBuilder;
import lombok.EqualsAndHashCode;
import
org.apache.shardingsphere.test.integration.framework.param.model.ITParameterizedArray;
import
org.apache.shardingsphere.test.runner.ParallelRunningStrategy.ParallelLevel;
-import
org.apache.shardingsphere.test.runner.executor.impl.DefaultParallelRunnerExecutor;
+import
org.apache.shardingsphere.test.runner.executor.impl.NormalParallelRunnerExecutor;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
/**
* Parallel runner executor with scenario.
*/
-public final class ScenarioParallelRunnerExecutor extends
DefaultParallelRunnerExecutor<ITParameterizedArray> {
+public final class ScenarioParallelRunnerExecutor extends
NormalParallelRunnerExecutor {
@Override
- protected ExecutorService getExecutorService(final ITParameterizedArray
key) {
- ScenarioKey scenarioKey = new ScenarioKey(key);
+ protected ExecutorService getExecutorService(final Object key) {
+ ScenarioKey scenarioKey = new ScenarioKey((ITParameterizedArray) key);
if (getExecutorServiceMap().containsKey(scenarioKey)) {
return getExecutorServiceMap().get(scenarioKey);
}
diff --git
a/test/runner/src/main/java/org/apache/shardingsphere/test/runner/ParallelParameterized.java
b/test/runner/src/main/java/org/apache/shardingsphere/test/runner/ParallelParameterized.java
index 2cb3c7226fd..929abb68c36 100644
---
a/test/runner/src/main/java/org/apache/shardingsphere/test/runner/ParallelParameterized.java
+++
b/test/runner/src/main/java/org/apache/shardingsphere/test/runner/ParallelParameterized.java
@@ -31,7 +31,7 @@ public final class ParallelParameterized extends
Parameterized {
public ParallelParameterized(final Class<?> clazz) throws Throwable {
// CHECKSTYLE:ON
super(clazz);
- setScheduler(new ParallelRunnerScheduler(getParallelLevel(clazz), new
ParallelRunnerExecutors<>()));
+ setScheduler(new ParallelRunnerScheduler(getParallelLevel(clazz), new
ParallelRunnerExecutors()));
}
private ParallelLevel getParallelLevel(final Class<?> clazz) {
diff --git
a/test/runner/src/main/java/org/apache/shardingsphere/test/runner/executor/ParallelRunnerExecutor.java
b/test/runner/src/main/java/org/apache/shardingsphere/test/runner/executor/ParallelRunnerExecutor.java
index c7a1e774857..5d1d46cc24a 100644
---
a/test/runner/src/main/java/org/apache/shardingsphere/test/runner/executor/ParallelRunnerExecutor.java
+++
b/test/runner/src/main/java/org/apache/shardingsphere/test/runner/executor/ParallelRunnerExecutor.java
@@ -22,15 +22,16 @@ import
org.apache.shardingsphere.test.runner.ParallelRunningStrategy.ParallelLev
/**
* Parallel runner executor.
*/
-public interface ParallelRunnerExecutor<T> {
+public interface ParallelRunnerExecutor {
/**
* Execute child statement.
*
* @param key executor key
* @param childStatement child statement
+ * @param <T> type of key
*/
- void execute(T key, Runnable childStatement);
+ <T> void execute(T key, Runnable childStatement);
/**
* Execute child statement.
diff --git
a/test/runner/src/main/java/org/apache/shardingsphere/test/runner/executor/ParallelRunnerExecutors.java
b/test/runner/src/main/java/org/apache/shardingsphere/test/runner/executor/ParallelRunnerExecutors.java
index 16056708509..16b6cf3a4a4 100644
---
a/test/runner/src/main/java/org/apache/shardingsphere/test/runner/executor/ParallelRunnerExecutors.java
+++
b/test/runner/src/main/java/org/apache/shardingsphere/test/runner/executor/ParallelRunnerExecutors.java
@@ -24,12 +24,10 @@ import java.util.concurrent.ConcurrentHashMap;
/**
* Parallel runner executors.
- *
- * @param <T> key type which bind to executor
*/
-public final class ParallelRunnerExecutors<T> {
+public final class ParallelRunnerExecutors {
- private final Map<T, ParallelRunnerExecutor<T>> executors = new
ConcurrentHashMap<>();
+ private final Map<String, ParallelRunnerExecutor> executors = new
ConcurrentHashMap<>();
/**
* Get executor.
@@ -38,12 +36,11 @@ public final class ParallelRunnerExecutors<T> {
* @param parallelLevel parallel level
* @return got executor
*/
- @SuppressWarnings("unchecked")
- public ParallelRunnerExecutor<T> getExecutor(final T key, final
ParallelLevel parallelLevel) {
+ public ParallelRunnerExecutor getExecutor(final String key, final
ParallelLevel parallelLevel) {
if (executors.containsKey(key)) {
return executors.get(key);
}
- ParallelRunnerExecutor<T> newExecutor =
ParallelRunnerExecutorFactory.newInstance(parallelLevel);
+ ParallelRunnerExecutor newExecutor =
ParallelRunnerExecutorFactory.newInstance(parallelLevel);
if (null != executors.putIfAbsent(key, newExecutor)) {
newExecutor.finished();
}
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/NormalParallelRunnerExecutor.java
similarity index 90%
rename from
test/runner/src/main/java/org/apache/shardingsphere/test/runner/executor/impl/DefaultParallelRunnerExecutor.java
rename to
test/runner/src/main/java/org/apache/shardingsphere/test/runner/executor/impl/NormalParallelRunnerExecutor.java
index 353258f6fa3..ec91be65350 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/NormalParallelRunnerExecutor.java
@@ -31,11 +31,9 @@ import java.util.concurrent.Executors;
import java.util.concurrent.Future;
/**
- * Default parallel runner executor.
- *
- * @param <T> key type bind to parallel executor
+ * Normal parallel runner executor.
*/
-public class DefaultParallelRunnerExecutor<T> implements
ParallelRunnerExecutor<T> {
+public class NormalParallelRunnerExecutor implements ParallelRunnerExecutor {
private final Collection<Future<?>> taskFeatures = new LinkedList<>();
@@ -45,7 +43,7 @@ public class DefaultParallelRunnerExecutor<T> implements
ParallelRunnerExecutor<
private volatile ExecutorService defaultExecutorService;
@Override
- public void execute(final T key, final Runnable childStatement) {
+ public <T> void execute(final T key, final Runnable childStatement) {
taskFeatures.add(getExecutorService(key).submit(childStatement));
}
@@ -54,7 +52,7 @@ public class DefaultParallelRunnerExecutor<T> implements
ParallelRunnerExecutor<
taskFeatures.add(getExecutorService().submit(childStatement));
}
- protected ExecutorService getExecutorService(final T key) {
+ protected <T> ExecutorService getExecutorService(final T key) {
if (executorServiceMap.containsKey(key)) {
return executorServiceMap.get(key);
}
@@ -69,7 +67,7 @@ public class DefaultParallelRunnerExecutor<T> implements
ParallelRunnerExecutor<
private ExecutorService getExecutorService() {
if (null == defaultExecutorService) {
- synchronized (DefaultParallelRunnerExecutor.class) {
+ synchronized (NormalParallelRunnerExecutor.class) {
if (null == defaultExecutorService) {
defaultExecutorService = Executors.newFixedThreadPool(
Runtime.getRuntime().availableProcessors(), new
ThreadFactoryBuilder().setDaemon(true).setNameFormat("ShardingSphere-ParallelTestThread-%d").build());
diff --git
a/test/runner/src/main/resources/META-INF/services/org.apache.shardingsphere.test.runner.executor.ParallelRunnerExecutor
b/test/runner/src/main/resources/META-INF/services/org.apache.shardingsphere.test.runner.executor.ParallelRunnerExecutor
index 4b1ce068cdf..57835bbe662 100644
---
a/test/runner/src/main/resources/META-INF/services/org.apache.shardingsphere.test.runner.executor.ParallelRunnerExecutor
+++
b/test/runner/src/main/resources/META-INF/services/org.apache.shardingsphere.test.runner.executor.ParallelRunnerExecutor
@@ -15,4 +15,4 @@
# limitations under the License.
#
-org.apache.shardingsphere.test.runner.executor.impl.DefaultParallelRunnerExecutor
+org.apache.shardingsphere.test.runner.executor.impl.NormalParallelRunnerExecutor
