Allow other ExecutorService implementations in AbstractQueueVisitor

Previously, only ThreadPoolExecutor implementations were allowed.

--
MOS_MIGRATED_REVID=105340237

4 files changed, 22 insertions, 9 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/actions/ConcurrentMultimapWithHeadElementTest.java b/src/test/java/com/google/devtools/build/lib/actions/ConcurrentMultimapWithHeadElementTest.java
index db004b2acc..d9fb1a3080 100644
--- a/src/test/java/com/google/devtools/build/lib/actions/ConcurrentMultimapWithHeadElementTest.java
+++ b/src/test/java/com/google/devtools/build/lib/actions/ConcurrentMultimapWithHeadElementTest.java
@@ -134,7 +134,7 @@ public class ConcurrentMultimapWithHeadElementTest {
     private final AtomicInteger actionCount = new AtomicInteger(0);
 
     private StressTester() {
-      super(/*concurrent=*/true, 200, 200, 1, TimeUnit.SECONDS,
+      super(/*concurrent=*/true, 200, 1, TimeUnit.SECONDS,
           /*failFastOnException=*/true, /*failFastOnInterrupt=*/true, "action-graph-test");
     }
 
diff --git a/src/test/java/com/google/devtools/build/lib/actions/MapBasedActionGraphTest.java b/src/test/java/com/google/devtools/build/lib/actions/MapBasedActionGraphTest.java
index 82fd413eee..6d5a23e665 100644
--- a/src/test/java/com/google/devtools/build/lib/actions/MapBasedActionGraphTest.java
+++ b/src/test/java/com/google/devtools/build/lib/actions/MapBasedActionGraphTest.java
@@ -81,7 +81,7 @@ public class MapBasedActionGraphTest {
     private final AtomicInteger actionCount = new AtomicInteger(0);
 
     private ActionRegisterer() {
-      super(/*concurrent=*/true, 200, 200, 1, TimeUnit.SECONDS,
+      super(/*concurrent=*/true, 200, 1, TimeUnit.SECONDS,
           /*failFastOnException=*/true, /*failFastOnInterrupt=*/true, "action-graph-test");
       FileSystem fileSystem = new InMemoryFileSystem(BlazeClock.instance());
       Path path = fileSystem.getPath("/root/foo");
diff --git a/src/test/java/com/google/devtools/build/lib/concurrent/AbstractQueueVisitorTest.java b/src/test/java/com/google/devtools/build/lib/concurrent/AbstractQueueVisitorTest.java
index cec348d2a2..19b4274267 100644
--- a/src/test/java/com/google/devtools/build/lib/concurrent/AbstractQueueVisitorTest.java
+++ b/src/test/java/com/google/devtools/build/lib/concurrent/AbstractQueueVisitorTest.java
@@ -474,7 +474,7 @@ public class AbstractQueueVisitorTest {
     private final Object lock = new Object();
 
     public CountingQueueVisitor() {
-      super(5, 5, 3L, TimeUnit.SECONDS, THREAD_NAME);
+      super(5, 3L, TimeUnit.SECONDS, THREAD_NAME);
     }
 
     public CountingQueueVisitor(ThreadPoolExecutor executor) {
@@ -505,15 +505,15 @@ public class AbstractQueueVisitorTest {
     private final static String THREAD_NAME = "BlazeTest ConcreteQueueVisitor";
 
     public ConcreteQueueVisitor() {
-      super(5, 5, 3L, TimeUnit.SECONDS, THREAD_NAME);
+      super(5, 3L, TimeUnit.SECONDS, THREAD_NAME);
     }
 
     public ConcreteQueueVisitor(boolean failFast) {
-      super(true, 5, 5, 3L, TimeUnit.SECONDS, failFast, THREAD_NAME);
+      super(true, 5, 3L, TimeUnit.SECONDS, failFast, THREAD_NAME);
     }
 
     public ConcreteQueueVisitor(boolean failFast, boolean failFastOnInterrupt) {
-      super(true, 5, 5, 3L, TimeUnit.SECONDS, failFast, failFastOnInterrupt, THREAD_NAME);
+      super(true, 5, 3L, TimeUnit.SECONDS, failFast, failFastOnInterrupt, THREAD_NAME);
     }
 
     public ConcreteQueueVisitor(ThreadPoolExecutor executor, boolean failFast,
diff --git a/src/test/java/com/google/devtools/build/skyframe/EagerInvalidatorTest.java b/src/test/java/com/google/devtools/build/skyframe/EagerInvalidatorTest.java
index 87f34a25d6..be7391f668 100644
--- a/src/test/java/com/google/devtools/build/skyframe/EagerInvalidatorTest.java
+++ b/src/test/java/com/google/devtools/build/skyframe/EagerInvalidatorTest.java
@@ -30,6 +30,7 @@ import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Sets;
 import com.google.common.testing.GcFinalization;
+import com.google.devtools.build.lib.concurrent.AbstractQueueVisitor;
 import com.google.devtools.build.lib.events.Reporter;
 import com.google.devtools.build.lib.testutil.TestUtils;
 import com.google.devtools.build.lib.util.Pair;
@@ -639,8 +640,15 @@ public class EagerInvalidatorTest {
       // Dirty the node, and ensure that the tracker is aware of it:
       Iterable<SkyKey> diff1 = ImmutableList.of(skyKey("a"));
       InvalidationState state1 = new DirtyingInvalidationState();
-      Preconditions.checkNotNull(EagerInvalidator.createInvalidatingVisitorIfNeeded(graph, diff1,
-          receiver, state1, dirtyKeyTracker)).run();
+      Preconditions.checkNotNull(
+              EagerInvalidator.createInvalidatingVisitorIfNeeded(
+                  graph,
+                  diff1,
+                  receiver,
+                  state1,
+                  dirtyKeyTracker,
+                  AbstractQueueVisitor.EXECUTOR_FACTORY))
+          .run();
       assertThat(dirtyKeyTracker.getDirtyKeys()).containsExactly(skyKey("a"), skyKey("ab"));
 
       // Delete the node, and ensure that the tracker is no longer tracking it:
@@ -662,7 +670,12 @@ public class EagerInvalidatorTest {
       Iterable<SkyKey> diff = ImmutableList.copyOf(keys);
       DirtyingNodeVisitor dirtyingNodeVisitor =
           EagerInvalidator.createInvalidatingVisitorIfNeeded(
-              graph, diff, invalidationReceiver, state, dirtyKeyTracker);
+              graph,
+              diff,
+              invalidationReceiver,
+              state,
+              dirtyKeyTracker,
+              AbstractQueueVisitor.EXECUTOR_FACTORY);
       if (dirtyingNodeVisitor != null) {
         visitor.set(dirtyingNodeVisitor);
         dirtyingNodeVisitor.run();