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/12/02 15:24:52 UTC
[shardingsphere] branch master updated: Rename ParallelRunnerExecutorKeyProvider (#22604)
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 93f8e7a6cc7 Rename ParallelRunnerExecutorKeyProvider (#22604)
93f8e7a6cc7 is described below
commit 93f8e7a6cc754ffd3ea50204de73a65e79604f9d
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Fri Dec 2 23:24:45 2022 +0800
Rename ParallelRunnerExecutorKeyProvider (#22604)
* Revise javadoc
* Rename ParallelRunnerExecutorKeyProvider
* Rename ParallelRunnerExecutorKeyProvider
---
.../backend/exception/StorageUnitNotExistedException.java | 2 +-
...der.java => CaseParallelRunnerExecutorKeyProvider.java} | 6 +++---
...java => ScenarioParallelRunnerExecutorKeyProvider.java} | 6 +++---
....runner.executor.key.ParallelRunnerExecutorKeyProvider} | 4 ++--
.../test/runner/executor/ParallelRunnerExecutor.java | 2 +-
.../key/ParallelRunnerExecutorKeyProvider.java} | 8 ++++----
.../key/ParallelRunnerExecutorKeyProviderFactory.java} | 14 +++++++-------
.../test/runner/scheduler/ParallelRunnerScheduler.java | 8 ++------
8 files changed, 23 insertions(+), 27 deletions(-)
diff --git a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/exception/StorageUnitNotExistedException.java b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/exception/StorageUnitNotExistedException.java
index c4a238edab6..908e0c12e00 100644
--- a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/exception/StorageUnitNotExistedException.java
+++ b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/exception/StorageUnitNotExistedException.java
@@ -26,7 +26,7 @@ import org.apache.shardingsphere.infra.util.exception.external.sql.sqlstate.XOpe
public final class StorageUnitNotExistedException extends MetaDataSQLException {
private static final long serialVersionUID = 4146100333670404924L;
-
+
public StorageUnitNotExistedException() {
super(XOpenSQLState.SYNTAX_ERROR, 0, "There is no storage unit in any database.");
}
diff --git a/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/runner/parallel/CaseTestKeyProvider.java b/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/runner/parallel/CaseParallelRunnerExecutorKeyProvider.java
similarity index 84%
rename from test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/runner/parallel/CaseTestKeyProvider.java
rename to test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/runner/parallel/CaseParallelRunnerExecutorKeyProvider.java
index 4df62978028..265eb389892 100644
--- a/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/runner/parallel/CaseTestKeyProvider.java
+++ b/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/runner/parallel/CaseParallelRunnerExecutorKeyProvider.java
@@ -18,13 +18,13 @@
package org.apache.shardingsphere.test.integration.framework.runner.parallel;
import org.apache.shardingsphere.test.runner.ParallelRunningStrategy.ParallelLevel;
-import org.apache.shardingsphere.test.runner.key.TestKeyProvider;
+import org.apache.shardingsphere.test.runner.executor.key.ParallelRunnerExecutorKeyProvider;
import org.apache.shardingsphere.test.runner.param.ParameterizedArray;
/**
- * Case test key provider.
+ * Case parallel runner executor key provider.
*/
-public final class CaseTestKeyProvider implements TestKeyProvider {
+public final class CaseParallelRunnerExecutorKeyProvider implements ParallelRunnerExecutorKeyProvider {
@Override
public String getKey(final ParameterizedArray parameterizedArray) {
diff --git a/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/runner/parallel/ScenarioTestKeyProvider.java b/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/runner/parallel/ScenarioParallelRunnerExecutorKeyProvider.java
similarity index 86%
rename from test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/runner/parallel/ScenarioTestKeyProvider.java
rename to test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/runner/parallel/ScenarioParallelRunnerExecutorKeyProvider.java
index e9d519b70ad..bd1c1aef804 100644
--- a/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/runner/parallel/ScenarioTestKeyProvider.java
+++ b/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/runner/parallel/ScenarioParallelRunnerExecutorKeyProvider.java
@@ -19,13 +19,13 @@ 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.key.TestKeyProvider;
+import org.apache.shardingsphere.test.runner.executor.key.ParallelRunnerExecutorKeyProvider;
import org.apache.shardingsphere.test.runner.param.ParameterizedArray;
/**
- * Scenario test key provider.
+ * Scenario parallel runner executor key provider.
*/
-public final class ScenarioTestKeyProvider implements TestKeyProvider {
+public final class ScenarioParallelRunnerExecutorKeyProvider implements ParallelRunnerExecutorKeyProvider {
@Override
public String getKey(final ParameterizedArray parameterizedArray) {
diff --git a/test/integration-test/test-suite/src/test/resources/META-INF/services/org.apache.shardingsphere.test.runner.key.TestKeyProvider b/test/integration-test/test-suite/src/test/resources/META-INF/services/org.apache.shardingsphere.test.runner.executor.key.ParallelRunnerExecutorKeyProvider
similarity index 91%
rename from test/integration-test/test-suite/src/test/resources/META-INF/services/org.apache.shardingsphere.test.runner.key.TestKeyProvider
rename to test/integration-test/test-suite/src/test/resources/META-INF/services/org.apache.shardingsphere.test.runner.executor.key.ParallelRunnerExecutorKeyProvider
index b4f23ce7cd5..66886abe359 100644
--- a/test/integration-test/test-suite/src/test/resources/META-INF/services/org.apache.shardingsphere.test.runner.key.TestKeyProvider
+++ b/test/integration-test/test-suite/src/test/resources/META-INF/services/org.apache.shardingsphere.test.runner.executor.key.ParallelRunnerExecutorKeyProvider
@@ -15,5 +15,5 @@
# limitations under the License.
#
-org.apache.shardingsphere.test.integration.framework.runner.parallel.CaseTestKeyProvider
-org.apache.shardingsphere.test.integration.framework.runner.parallel.ScenarioTestKeyProvider
+org.apache.shardingsphere.test.integration.framework.runner.parallel.CaseParallelRunnerExecutorKeyProvider
+org.apache.shardingsphere.test.integration.framework.runner.parallel.ScenarioParallelRunnerExecutorKeyProvider
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 830e9fcbfeb..7eb2ca1a34e 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
@@ -29,7 +29,7 @@ import java.util.concurrent.Executors;
import java.util.concurrent.Future;
/**
- * Abstract parallel runner executor.
+ * Parallel runner executor.
*/
public final class ParallelRunnerExecutor {
diff --git a/test/runner/src/main/java/org/apache/shardingsphere/test/runner/key/TestKeyProvider.java b/test/runner/src/main/java/org/apache/shardingsphere/test/runner/executor/key/ParallelRunnerExecutorKeyProvider.java
similarity index 86%
rename from test/runner/src/main/java/org/apache/shardingsphere/test/runner/key/TestKeyProvider.java
rename to test/runner/src/main/java/org/apache/shardingsphere/test/runner/executor/key/ParallelRunnerExecutorKeyProvider.java
index 1aec5efbb8f..5cc0fe97045 100644
--- a/test/runner/src/main/java/org/apache/shardingsphere/test/runner/key/TestKeyProvider.java
+++ b/test/runner/src/main/java/org/apache/shardingsphere/test/runner/executor/key/ParallelRunnerExecutorKeyProvider.java
@@ -15,21 +15,21 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.runner.key;
+package org.apache.shardingsphere.test.runner.executor.key;
import org.apache.shardingsphere.test.runner.ParallelRunningStrategy.ParallelLevel;
import org.apache.shardingsphere.test.runner.param.ParameterizedArray;
/**
- * Test key provider.
+ * Parallel runner executor key provider.
*/
-public interface TestKeyProvider {
+public interface ParallelRunnerExecutorKeyProvider {
/**
* Get key.
*
* @param parameterizedArray parameterized array
- * @return executor key
+ * @return parallel runner executor key
*/
String getKey(ParameterizedArray parameterizedArray);
diff --git a/test/runner/src/main/java/org/apache/shardingsphere/test/runner/key/TestKeyProviderFactory.java b/test/runner/src/main/java/org/apache/shardingsphere/test/runner/executor/key/ParallelRunnerExecutorKeyProviderFactory.java
similarity index 70%
rename from test/runner/src/main/java/org/apache/shardingsphere/test/runner/key/TestKeyProviderFactory.java
rename to test/runner/src/main/java/org/apache/shardingsphere/test/runner/executor/key/ParallelRunnerExecutorKeyProviderFactory.java
index d5f8112228b..5fab4f76cb1 100644
--- a/test/runner/src/main/java/org/apache/shardingsphere/test/runner/key/TestKeyProviderFactory.java
+++ b/test/runner/src/main/java/org/apache/shardingsphere/test/runner/executor/key/ParallelRunnerExecutorKeyProviderFactory.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.runner.key;
+package org.apache.shardingsphere.test.runner.executor.key;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
@@ -26,26 +26,26 @@ import java.util.Map;
import java.util.ServiceLoader;
/**
- * Test key provider factory.
+ * Parallel runner executor key provider factory.
*/
@NoArgsConstructor(access = AccessLevel.PRIVATE)
-public final class TestKeyProviderFactory {
+public final class ParallelRunnerExecutorKeyProviderFactory {
- private static final Map<ParallelLevel, TestKeyProvider> PROVIDERS = new HashMap<>();
+ private static final Map<ParallelLevel, ParallelRunnerExecutorKeyProvider> PROVIDERS = new HashMap<>();
static {
- for (TestKeyProvider each : ServiceLoader.load(TestKeyProvider.class)) {
+ for (ParallelRunnerExecutorKeyProvider each : ServiceLoader.load(ParallelRunnerExecutorKeyProvider.class)) {
PROVIDERS.put(each.getParallelLevel(), each);
}
}
/**
- * Create new instance of executor key provider.
+ * Create new instance of parallel runner executor key provider.
*
* @param parallelLevel parallel level
* @return created instance
*/
- public static TestKeyProvider newInstance(final ParallelLevel parallelLevel) {
+ public static ParallelRunnerExecutorKeyProvider newInstance(final ParallelLevel parallelLevel) {
return PROVIDERS.get(parallelLevel);
}
}
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 47f8e9990da..0945289bec1 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,9 +20,7 @@ package org.apache.shardingsphere.test.runner.scheduler;
import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.test.runner.ParallelRunningStrategy.ParallelLevel;
import org.apache.shardingsphere.test.runner.executor.ParallelRunnerExecutor;
-import org.apache.shardingsphere.test.runner.key.TestKeyProvider;
-import org.apache.shardingsphere.test.runner.key.TestKeyProviderFactory;
-import org.apache.shardingsphere.test.runner.param.ParameterizedArray;
+import org.apache.shardingsphere.test.runner.executor.key.ParallelRunnerExecutorKeyProviderFactory;
import org.apache.shardingsphere.test.runner.param.RunnerParameters;
import org.junit.runners.model.RunnerScheduler;
@@ -38,9 +36,7 @@ public final class ParallelRunnerScheduler implements RunnerScheduler {
@Override
public void schedule(final Runnable childStatement) {
- ParameterizedArray parameterizedArray = new RunnerParameters(childStatement).getParameterizedArray();
- TestKeyProvider provider = TestKeyProviderFactory.newInstance(parallelLevel);
- executor.execute(provider.getKey(parameterizedArray), childStatement);
+ executor.execute(ParallelRunnerExecutorKeyProviderFactory.newInstance(parallelLevel).getKey(new RunnerParameters(childStatement).getParameterizedArray()), childStatement);
}
@Override