Refactor JobScheduler's work stealing executor with async mode factory

neo4j · Sep 11, 2018 · 5dc9053 · 5dc9053
1 parent 971757b
commit 5dc9053
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 9 deletions.
diff --git a/community/common/src/main/java/org/neo4j/scheduler/JobScheduler.java b/community/common/src/main/java/org/neo4j/scheduler/JobScheduler.java
@@ -50,10 +50,11 @@ public interface JobScheduler extends Lifecycle, AutoCloseable
     ExecutorService workStealingExecutor( Group group, int parallelism );
 
     /**
-     * Creates an {@link ExecutorService} that does works-stealing - read more about this in {@link ForkJoinPool}
-     * @param asyncMode Defaults to false. A value of true may be more suitable for systems where worker threads only process event-style asynchronous tasks
+     * Creates an {@link ExecutorService} that does works-stealing with asyncMode set to true - read more about this in {@link ForkJoinPool}
+     * <p>
+     * This may be more suitable for systems where worker threads only process event-style asynchronous tasks.
      */
-    ExecutorService workStealingExecutor( Group group, int parallelism, boolean asyncMode );
+    ExecutorService workStealingExecutorAsyncMode( Group group, int parallelism );
 
     /**
      * Expose a group scheduler as a {@link java.util.concurrent.ThreadFactory}.

diff --git a/community/common/src/test/java/org/neo4j/scheduler/JobSchedulerAdapter.java b/community/common/src/test/java/org/neo4j/scheduler/JobSchedulerAdapter.java
@@ -79,7 +79,7 @@ public ExecutorService workStealingExecutor( Group group, int parallelism )
     }
 
     @Override
-    public ExecutorService workStealingExecutor( Group group, int parallelism, boolean asyncMode )
+    public ExecutorService workStealingExecutorAsyncMode( Group group, int parallelism )
     {
         return null;
     }

diff --git a/community/common/src/test/java/org/neo4j/scheduler/ThreadPoolJobScheduler.java b/community/common/src/test/java/org/neo4j/scheduler/ThreadPoolJobScheduler.java
@@ -58,7 +58,7 @@ public ExecutorService workStealingExecutor( Group group, int parallelism )
     }
 
     @Override
-    public ExecutorService workStealingExecutor( Group group, int parallelism, boolean asyncMode )
+    public ExecutorService workStealingExecutorAsyncMode( Group group, int parallelism )
     {
         return executor;
     }

diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/scheduler/CentralJobScheduler.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/scheduler/CentralJobScheduler.java
@@ -118,7 +118,12 @@ public ExecutorService workStealingExecutor( Group group, int parallelism )
     }
 
     @Override
-    public ExecutorService workStealingExecutor( Group group, int parallelism, boolean asyncMode )
+    public ExecutorService workStealingExecutorAsyncMode( Group group, int parallelism )
+    {
+        return workStealingExecutor( group, parallelism, true );
+    }
+
+    private ExecutorService workStealingExecutor( Group group, int parallelism, boolean asyncMode )
     {
         return workStealingExecutors.computeIfAbsent( group, g -> createNewWorkStealingExecutor( g, parallelism, asyncMode ) );
     }

diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/util/CountingJobScheduler.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/util/CountingJobScheduler.java
@@ -65,9 +65,9 @@ public ExecutorService workStealingExecutor( Group group, int parallelism )
     }
 
     @Override
-    public ExecutorService workStealingExecutor( Group group, int parallelism, boolean asyncMode )
+    public ExecutorService workStealingExecutorAsyncMode( Group group, int parallelism )
     {
-        return delegate.workStealingExecutor( group, parallelism, asyncMode );
+        return delegate.workStealingExecutorAsyncMode( group, parallelism );
     }
 
     @Override

diff --git a/community/kernel/src/test/java/org/neo4j/test/FakeClockJobScheduler.java b/community/kernel/src/test/java/org/neo4j/test/FakeClockJobScheduler.java
@@ -107,7 +107,7 @@ public ExecutorService workStealingExecutor( Group group, int parallelism )
     }
 
     @Override
-    public ExecutorService workStealingExecutor( Group group, int parallelism, boolean asyncMode )
+    public ExecutorService workStealingExecutorAsyncMode( Group group, int parallelism )
     {
         throw new UnsupportedOperationException();
     }