[shardingsphere] branch master updated: Remove ParallelRunnerExecutorFactory.getExecutor() (#22490)

[zhaojinchao]

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 710f53e45ae Remove ParallelRunnerExecutorFactory.getExecutor() (#22490)
710f53e45ae is described below

commit 710f53e45aef175ad9b6c33121b8b0e1a90e6157
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Tue Nov 29 00:15:45 2022 +0800

    Remove ParallelRunnerExecutorFactory.getExecutor() (#22490)
    
    * Remove ParallelRunnerExecutorFactory.getExecutor()
    
    * Remove ParallelRunnerExecutorFactory.getExecutor()
---
 .../executor/ParallelRunnerExecutorFactory.java    | 14 +++----------
 .../impl/DefaultParallelRunnerExecutorFactory.java | 23 ++--------------------
 .../runner/scheduler/ParallelRunnerScheduler.java  |  2 +-
 3 files changed, 6 insertions(+), 33 deletions(-)

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 7658160702c..b38ea7558d9 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
@@ -27,22 +27,14 @@ import 
org.apache.shardingsphere.test.runner.ParallelRunningStrategy.ParallelLev
 public interface ParallelRunnerExecutorFactory<T> {
     
     /**
-     * Get executor factory by key and parallel level.
+     * Get executor.
      *
-     * @param key key bind to the factory
+     * @param key key bind to the executor
      * @param parallelLevel parallel level
-     * @return executor by key and parallel level
+     * @return got executor
      */
     ParallelRunnerExecutor getExecutor(T key, ParallelLevel parallelLevel);
     
-    /**
-     * Get factory by parallel level.
-     *
-     * @param parallelLevel parallel level
-     * @return executor by parallel level
-     */
-    ParallelRunnerExecutor getExecutor(ParallelLevel parallelLevel);
-    
     /**
      * Finish all executors.
      */
diff --git 
a/test/runner/src/main/java/org/apache/shardingsphere/test/runner/executor/impl/DefaultParallelRunnerExecutorFactory.java
 
b/test/runner/src/main/java/org/apache/shardingsphere/test/runner/executor/impl/DefaultParallelRunnerExecutorFactory.java
index 8a77277075a..2caaf9aee84 100644
--- 
a/test/runner/src/main/java/org/apache/shardingsphere/test/runner/executor/impl/DefaultParallelRunnerExecutorFactory.java
+++ 
b/test/runner/src/main/java/org/apache/shardingsphere/test/runner/executor/impl/DefaultParallelRunnerExecutorFactory.java
@@ -31,8 +31,6 @@ public class DefaultParallelRunnerExecutorFactory<T> 
implements ParallelRunnerEx
     
     private final Map<T, ParallelRunnerExecutor> executors = new 
ConcurrentHashMap<>();
     
-    private volatile ParallelRunnerExecutor defaultExecutor;
-    
     /**
      * Create executor instance by parallel level.
      *
@@ -40,7 +38,7 @@ public class DefaultParallelRunnerExecutorFactory<T> 
implements ParallelRunnerEx
      * @return executor by parallel level
      */
     public ParallelRunnerExecutor newInstance(final ParallelLevel 
parallelLevel) {
-        return new DefaultParallelRunnerExecutor();
+        return new DefaultParallelRunnerExecutor<>();
     }
     
     @Override
@@ -55,25 +53,8 @@ public class DefaultParallelRunnerExecutorFactory<T> 
implements ParallelRunnerEx
         return executors.get(key);
     }
     
-    @Override
-    public final ParallelRunnerExecutor getExecutor(final ParallelLevel 
parallelLevel) {
-        if (null == defaultExecutor) {
-            synchronized (DefaultParallelRunnerExecutorFactory.class) {
-                if (null == defaultExecutor) {
-                    defaultExecutor = new DefaultParallelRunnerExecutor<>();
-                }
-            }
-        }
-        return defaultExecutor;
-    }
-    
     @Override
     public final void finishAllExecutors() {
-        for (ParallelRunnerExecutor<?> each : executors.values()) {
-            each.finished();
-        }
-        if (null != defaultExecutor) {
-            defaultExecutor.finished();
-        }
+        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 078dd5b2708..2af350138fc 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) {
-        executorFactory.getExecutor(parallelLevel).execute(childStatement);
+        executorFactory.getExecutor("", parallelLevel).execute(childStatement);
     }
     
     @Override