This is an automated email from the ASF dual-hosted git repository.
zhaojinchao 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 09199dd6b0d Rename ParallelRunnerExecutors (#22509)
09199dd6b0d is described below
commit 09199dd6b0d70908e400150508b28863ce2d65c1
Author: Liang Zhang <[email protected]>
AuthorDate: Tue Nov 29 21:21:47 2022 +0800
Rename ParallelRunnerExecutors (#22509)
* Rename ParallelRunnerExecutors
* Rename ParallelRunnerExecutors
* Rename ParallelRunnerExecutors
---
kernel/data-pipeline/cdc/client/pom.xml | 3 +--
kernel/data-pipeline/cdc/core/pom.xml | 3 +--
kernel/data-pipeline/cdc/protocol/pom.xml | 3 +--
.../runner/ShardingSphereIntegrationTestParameterized.java | 4 ++--
.../parallel/ParameterizedParallelRunnerScheduler.java | 4 ++--
.../shardingsphere/test/runner/ParallelParameterized.java | 4 ++--
.../test/runner/executor/ParallelRunnerExecutorFactory.java | 1 +
...nnerExecutorEngine.java => ParallelRunnerExecutors.java} | 13 +++++++------
.../test/runner/scheduler/ParallelRunnerScheduler.java | 6 +++---
9 files changed, 20 insertions(+), 21 deletions(-)
diff --git a/kernel/data-pipeline/cdc/client/pom.xml
b/kernel/data-pipeline/cdc/client/pom.xml
index 046e9046a72..2da0211d90b 100644
--- a/kernel/data-pipeline/cdc/client/pom.xml
+++ b/kernel/data-pipeline/cdc/client/pom.xml
@@ -16,8 +16,7 @@
~ limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
<parent>
diff --git a/kernel/data-pipeline/cdc/core/pom.xml
b/kernel/data-pipeline/cdc/core/pom.xml
index 6293e04b9e4..c8621d3e72e 100644
--- a/kernel/data-pipeline/cdc/core/pom.xml
+++ b/kernel/data-pipeline/cdc/core/pom.xml
@@ -16,8 +16,7 @@
~ limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
<parent>
diff --git a/kernel/data-pipeline/cdc/protocol/pom.xml
b/kernel/data-pipeline/cdc/protocol/pom.xml
index e4c7dea7f00..58d17e6e585 100644
--- a/kernel/data-pipeline/cdc/protocol/pom.xml
+++ b/kernel/data-pipeline/cdc/protocol/pom.xml
@@ -16,8 +16,7 @@
~ limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
<parent>
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 8fdb1e10271..7077285424a 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.ParameterizedParallelRunnerScheduler;
import org.apache.shardingsphere.test.runner.ParallelRunningStrategy;
-import
org.apache.shardingsphere.test.runner.executor.ParallelRunnerExecutorEngine;
+import org.apache.shardingsphere.test.runner.executor.ParallelRunnerExecutors;
import org.junit.runners.Parameterized;
/**
@@ -36,7 +36,7 @@ public final class ShardingSphereIntegrationTestParameterized
extends Parameteri
if (ClusterEnvironment.Type.DOCKER !=
IntegrationTestEnvironment.getInstance().getClusterEnvironment().getType()) {
ParallelRunningStrategy parallelRunningStrategy =
clazz.getAnnotation(ParallelRunningStrategy.class);
if (null != parallelRunningStrategy) {
- setScheduler(new
ParameterizedParallelRunnerScheduler(parallelRunningStrategy.value(), new
ParallelRunnerExecutorEngine()));
+ setScheduler(new
ParameterizedParallelRunnerScheduler(parallelRunningStrategy.value(), new
ParallelRunnerExecutors()));
}
}
}
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 d64e2a73f55..b2289e7ade3 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
@@ -19,7 +19,7 @@ package
org.apache.shardingsphere.test.integration.framework.runner.parallel;
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.ParallelRunnerExecutorEngine;
+import org.apache.shardingsphere.test.runner.executor.ParallelRunnerExecutors;
import org.apache.shardingsphere.test.runner.param.RunnerParameters;
import org.apache.shardingsphere.test.runner.scheduler.ParallelRunnerScheduler;
@@ -28,7 +28,7 @@ import
org.apache.shardingsphere.test.runner.scheduler.ParallelRunnerScheduler;
*/
public final class ParameterizedParallelRunnerScheduler extends
ParallelRunnerScheduler {
- public ParameterizedParallelRunnerScheduler(final ParallelLevel
parallelLevel, final ParallelRunnerExecutorEngine executorEngine) {
+ public ParameterizedParallelRunnerScheduler(final ParallelLevel
parallelLevel, final ParallelRunnerExecutors executorEngine) {
super(parallelLevel, executorEngine);
}
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 664bfebfa52..2cb3c7226fd 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
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.test.runner;
import
org.apache.shardingsphere.test.runner.ParallelRunningStrategy.ParallelLevel;
-import
org.apache.shardingsphere.test.runner.executor.ParallelRunnerExecutorEngine;
+import org.apache.shardingsphere.test.runner.executor.ParallelRunnerExecutors;
import org.apache.shardingsphere.test.runner.scheduler.ParallelRunnerScheduler;
import org.junit.runners.Parameterized;
@@ -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
ParallelRunnerExecutorEngine<>()));
+ 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/ParallelRunnerExecutorFactory.java
b/test/runner/src/main/java/org/apache/shardingsphere/test/runner/executor/ParallelRunnerExecutorFactory.java
index ae97e5d796b..ce796a97ab6 100644
---
a/test/runner/src/main/java/org/apache/shardingsphere/test/runner/executor/ParallelRunnerExecutorFactory.java
+++
b/test/runner/src/main/java/org/apache/shardingsphere/test/runner/executor/ParallelRunnerExecutorFactory.java
@@ -29,6 +29,7 @@ import java.util.ServiceLoader;
/**
* Parallel runner executor factory.
*/
+@SuppressWarnings("rawtypes")
@NoArgsConstructor(access = AccessLevel.PRIVATE)
public final class ParallelRunnerExecutorFactory {
diff --git
a/test/runner/src/main/java/org/apache/shardingsphere/test/runner/executor/ParallelRunnerExecutorEngine.java
b/test/runner/src/main/java/org/apache/shardingsphere/test/runner/executor/ParallelRunnerExecutors.java
similarity index 78%
rename from
test/runner/src/main/java/org/apache/shardingsphere/test/runner/executor/ParallelRunnerExecutorEngine.java
rename to
test/runner/src/main/java/org/apache/shardingsphere/test/runner/executor/ParallelRunnerExecutors.java
index 53ad5aeed57..16056708509 100644
---
a/test/runner/src/main/java/org/apache/shardingsphere/test/runner/executor/ParallelRunnerExecutorEngine.java
+++
b/test/runner/src/main/java/org/apache/shardingsphere/test/runner/executor/ParallelRunnerExecutors.java
@@ -23,13 +23,13 @@ import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
/**
- * Parallel runner executor engine.
+ * Parallel runner executors.
*
* @param <T> key type which bind to executor
*/
-public final class ParallelRunnerExecutorEngine<T> {
+public final class ParallelRunnerExecutors<T> {
- private final Map<T, ParallelRunnerExecutor> executors = new
ConcurrentHashMap<>();
+ private final Map<T, ParallelRunnerExecutor<T>> executors = new
ConcurrentHashMap<>();
/**
* Get executor.
@@ -38,11 +38,12 @@ public final class ParallelRunnerExecutorEngine<T> {
* @param parallelLevel parallel level
* @return got executor
*/
- public ParallelRunnerExecutor getExecutor(final T key, final ParallelLevel
parallelLevel) {
+ @SuppressWarnings("unchecked")
+ public ParallelRunnerExecutor<T> getExecutor(final T key, final
ParallelLevel parallelLevel) {
if (executors.containsKey(key)) {
return executors.get(key);
}
- ParallelRunnerExecutor newExecutor =
ParallelRunnerExecutorFactory.newInstance(parallelLevel);
+ ParallelRunnerExecutor<T> newExecutor =
ParallelRunnerExecutorFactory.newInstance(parallelLevel);
if (null != executors.putIfAbsent(key, newExecutor)) {
newExecutor.finished();
}
@@ -52,7 +53,7 @@ public final class ParallelRunnerExecutorEngine<T> {
/**
* Finish all executors.
*/
- public void finishAllExecutors() {
+ public void finishAll() {
executors.values().forEach(ParallelRunnerExecutor::finished);
}
}
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 df8640daff6..954994e2b8a 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
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.test.runner.scheduler;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import
org.apache.shardingsphere.test.runner.ParallelRunningStrategy.ParallelLevel;
-import
org.apache.shardingsphere.test.runner.executor.ParallelRunnerExecutorEngine;
+import org.apache.shardingsphere.test.runner.executor.ParallelRunnerExecutors;
import org.junit.runners.model.RunnerScheduler;
/**
@@ -32,7 +32,7 @@ public class ParallelRunnerScheduler implements
RunnerScheduler {
private final ParallelLevel parallelLevel;
- private final ParallelRunnerExecutorEngine executorEngine;
+ private final ParallelRunnerExecutors executorEngine;
@Override
public void schedule(final Runnable childStatement) {
@@ -41,6 +41,6 @@ public class ParallelRunnerScheduler implements
RunnerScheduler {
@Override
public final void finished() {
- executorEngine.finishAllExecutors();
+ executorEngine.finishAll();
}
}
