Order Skyframe evaluations in a priority queue, with all children of a given node having the same priority, later enqueueings having higher priority, re-enqueued nodes having highest priority, and new root nodes having lowest priority. Experimentally, this can save significant RAM (1.4G in some builds!) while not affecting speed.

Also do a semi-drive-by deleting ExecutorFactory parameter to AbstractQueueVisitor, since it was always AbstractQueueVisitor.EXECUTOR_FACTORY.

PiperOrigin-RevId: 208560889

4 files changed, 2 insertions, 14 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 d48cc5d2ec..7a3aa5f312 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
@@ -137,7 +137,6 @@ public class ConcurrentMultimapWithHeadElementTest {
           TimeUnit.SECONDS,
           /*failFastOnException=*/ true,
           "action-graph-test",
-          AbstractQueueVisitor.EXECUTOR_FACTORY,
           ErrorClassifier.DEFAULT);
     }
 
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 5de14d956c..5ec0d4a58f 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
@@ -89,7 +89,6 @@ public class MapBasedActionGraphTest {
           TimeUnit.SECONDS,
           /*failFastOnException=*/ true,
           "action-graph-test",
-          AbstractQueueVisitor.EXECUTOR_FACTORY,
           ErrorClassifier.DEFAULT);
       Path execRoot = fileSystem.getPath("/");
       Path root = fileSystem.getPath("/root");
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 070011b0d9..79ab720789 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
@@ -564,7 +564,6 @@ public class AbstractQueueVisitorTest {
           TimeUnit.SECONDS,
           /* failFastOnException= */ false,
           THREAD_NAME,
-          AbstractQueueVisitor.EXECUTOR_FACTORY,
           ErrorClassifier.DEFAULT);
     }
 
@@ -603,7 +602,6 @@ public class AbstractQueueVisitorTest {
           TimeUnit.SECONDS,
           /* failFastOnException= */ false,
           THREAD_NAME,
-          AbstractQueueVisitor.EXECUTOR_FACTORY,
           ErrorClassifier.DEFAULT);
     }
 
@@ -614,7 +612,6 @@ public class AbstractQueueVisitorTest {
           TimeUnit.SECONDS,
           failFast,
           THREAD_NAME,
-          AbstractQueueVisitor.EXECUTOR_FACTORY,
           ErrorClassifier.DEFAULT);
     }
 
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 223b14b37c..6239319247 100644
--- a/src/test/java/com/google/devtools/build/skyframe/EagerInvalidatorTest.java
+++ b/src/test/java/com/google/devtools/build/skyframe/EagerInvalidatorTest.java
@@ -24,7 +24,6 @@ import com.google.common.collect.Iterables;
 import com.google.common.collect.Sets;
 import com.google.common.eventbus.EventBus;
 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;
@@ -562,8 +561,7 @@ public class EagerInvalidatorTest {
       ImmutableList<SkyKey> diff = ImmutableList.of(GraphTester.nonHermeticKey("a"));
       InvalidationState state1 = new DirtyingInvalidationState();
       Preconditions.checkNotNull(
-              EagerInvalidator.createInvalidatingVisitorIfNeeded(
-                  graph, diff, receiver, state1, AbstractQueueVisitor.EXECUTOR_FACTORY))
+              EagerInvalidator.createInvalidatingVisitorIfNeeded(graph, diff, receiver, state1))
           .run();
       assertThat(receiver.getUnenqueuedDirtyKeys()).containsExactly(diff.get(0), skyKey("ab"));
 
@@ -585,12 +583,7 @@ public class EagerInvalidatorTest {
         throws InterruptedException {
       Iterable<SkyKey> diff = ImmutableList.copyOf(keys);
       DirtyingNodeVisitor dirtyingNodeVisitor =
-          EagerInvalidator.createInvalidatingVisitorIfNeeded(
-              graph,
-              diff,
-              progressReceiver,
-              state,
-              AbstractQueueVisitor.EXECUTOR_FACTORY);
+          EagerInvalidator.createInvalidatingVisitorIfNeeded(graph, diff, progressReceiver, state);
       if (dirtyingNodeVisitor != null) {
         visitor.set(dirtyingNodeVisitor);
         dirtyingNodeVisitor.run();