You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by du...@apache.org on 2022/11/30 11:37:31 UTC
[shardingsphere] branch master updated: Remove ParallelRunnerExecutor.execute() without key (#22523)
This is an automated email from the ASF dual-hosted git repository.
duanzhengqiang 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 656774f32f0 Remove ParallelRunnerExecutor.execute() without key (#22523)
656774f32f0 is described below
commit 656774f32f065c709c70324f38f4fa5b4cc6aab5
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Wed Nov 30 19:37:18 2022 +0800
Remove ParallelRunnerExecutor.execute() without key (#22523)
* Remove ParallelRunnerExecutor.execute() without key
* Remove ParallelRunnerExecutor.execute() without key
---
.../ParameterizedParallelRunnerScheduler.java | 3 ++-
.../parallel/impl/CaseParallelRunnerExecutor.java | 5 -----
.../runner/executor/ParallelRunnerExecutor.java | 7 -------
.../impl/NormalParallelRunnerExecutor.java | 22 ----------------------
.../runner/scheduler/ParallelRunnerScheduler.java | 2 +-
5 files changed, 3 insertions(+), 36 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 c2951e76b02..b9dc3f1be00 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
@@ -36,6 +36,7 @@ public final class ParameterizedParallelRunnerScheduler extends ParallelRunnerSc
@Override
public void schedule(final Runnable childStatement) {
ITParameterizedArray parameterizedArray = (ITParameterizedArray) new RunnerParameters(childStatement).getParameterizedArray();
- getExecutorEngine().getExecutor(parameterizedArray.getDatabaseType().getType(), getParallelLevel()).execute(new ScenarioKey(parameterizedArray).toString(), childStatement);
+ getExecutorEngine().getExecutor(parameterizedArray.getDatabaseType().getType(), getParallelLevel())
+ .execute(ParallelLevel.SCENARIO == getParallelLevel() ? new ScenarioKey(parameterizedArray).toString() : "", 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 c390c83c2c8..f0539423df1 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
@@ -25,11 +25,6 @@ import org.apache.shardingsphere.test.runner.executor.impl.NormalParallelRunnerE
*/
public final class CaseParallelRunnerExecutor extends NormalParallelRunnerExecutor {
- @Override
- public void execute(final String key, final Runnable childStatement) {
- execute(childStatement);
- }
-
@Override
public ParallelLevel getParallelLevel() {
return ParallelLevel.CASE;
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 255f8916436..e35c75fd422 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
@@ -32,13 +32,6 @@ public interface ParallelRunnerExecutor {
*/
void execute(String key, Runnable childStatement);
- /**
- * Execute child statement.
- *
- * @param childStatement child statement
- */
- void execute(Runnable childStatement);
-
/**
* Override to implement any behavior that must occur after all children have been scheduled (for example, waiting for them all to finish).
*/
diff --git a/test/runner/src/main/java/org/apache/shardingsphere/test/runner/executor/impl/NormalParallelRunnerExecutor.java b/test/runner/src/main/java/org/apache/shardingsphere/test/runner/executor/impl/NormalParallelRunnerExecutor.java
index 288b4578a30..8366e17a86e 100644
--- a/test/runner/src/main/java/org/apache/shardingsphere/test/runner/executor/impl/NormalParallelRunnerExecutor.java
+++ b/test/runner/src/main/java/org/apache/shardingsphere/test/runner/executor/impl/NormalParallelRunnerExecutor.java
@@ -40,18 +40,11 @@ public class NormalParallelRunnerExecutor implements ParallelRunnerExecutor {
@Getter
private final Map<Object, ExecutorService> executorServices = new ConcurrentHashMap<>();
- private volatile ExecutorService defaultExecutorService;
-
@Override
public void execute(final String key, final Runnable childStatement) {
futures.add(getExecutorService(key).submit(childStatement));
}
- @Override
- public void execute(final Runnable childStatement) {
- futures.add(getExecutorService().submit(childStatement));
- }
-
protected ExecutorService getExecutorService(final String key) {
if (executorServices.containsKey(key)) {
return executorServices.get(key);
@@ -65,18 +58,6 @@ public class NormalParallelRunnerExecutor implements ParallelRunnerExecutor {
return executorServices.get(key);
}
- private ExecutorService getExecutorService() {
- if (null == defaultExecutorService) {
- synchronized (NormalParallelRunnerExecutor.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() {
futures.forEach(each -> {
@@ -86,9 +67,6 @@ public class NormalParallelRunnerExecutor implements ParallelRunnerExecutor {
}
});
executorServices.values().forEach(ExecutorService::shutdownNow);
- if (null != defaultExecutorService) {
- defaultExecutorService.shutdownNow();
- }
}
@Override
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 954994e2b8a..4393d128f3d 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
@@ -36,7 +36,7 @@ public class ParallelRunnerScheduler implements RunnerScheduler {
@Override
public void schedule(final Runnable childStatement) {
- executorEngine.getExecutor("", parallelLevel).execute(childStatement);
+ executorEngine.getExecutor("", parallelLevel).execute("", childStatement);
}
@Override