commit b6bf51dfc36007aa89aa6eb8fef0e1a158c91064
author nharmata <nharmata@google.com> Fri Jul 27 13:49:45 2018 -0700
committer Copybara-Service <copybara-piper@google.com> Fri Jul 27 13:51:47 2018 -0700
tree a1a8e34516d5123d92b31b750e8bee126de353c3
parent 25e75dc2f15c8fd405226fd3a3f68a3a7f857392

Fix crash bug in SkyQuery rdeps when there's a dependency edge filter.

RELNOTES: None
PiperOrigin-RevId: 206368137

src/main/java/com/google/devtools/build/lib/query2/ParallelSkyQueryUtils.java

diff --git a/src/main/java/com/google/devtools/build/lib/query2/ParallelSkyQueryUtils.java b/src/main/java/com/google/devtools/build/lib/query2/ParallelSkyQueryUtils.java
index c95a653..5ad164c 100644
--- a/src/main/java/com/google/devtools/build/lib/query2/ParallelSkyQueryUtils.java
+++ b/src/main/java/com/google/devtools/build/lib/query2/ParallelSkyQueryUtils.java
@@ -70,7 +70,7 @@
         ParallelVisitor.createParallelVisitorCallback(
             new RdepsUnboundedVisitor.Factory(
                 env,
-                /*universe=*/ Predicates.alwaysTrue(),
+                /*unfilteredUniverse=*/ Predicates.alwaysTrue(),
                 callback,
                 packageSemaphore)));
   }
@@ -97,7 +97,7 @@
   static QueryTaskFuture<Void> getRdepsInUniverseUnboundedParallel(
       SkyQueryEnvironment env,
       QueryExpression expression,
-      Predicate<SkyKey> universe,
+      Predicate<SkyKey> unfilteredUniverse,
       QueryExpressionContext<Target> context,
       Callback<Target> callback,
       MultisetSemaphore<PackageIdentifier> packageSemaphore) {
@@ -105,7 +105,8 @@
         expression,
         context,
         ParallelVisitor.createParallelVisitorCallback(
-            new RdepsUnboundedVisitor.Factory(env, universe, callback, packageSemaphore)));
+            new RdepsUnboundedVisitor.Factory(
+                env, unfilteredUniverse, callback, packageSemaphore)));
   }
 
   static QueryTaskFuture<Predicate<SkyKey>> getDTCSkyKeyPredicateFuture(
@@ -126,7 +127,7 @@
               () -> {
                 Callback<Target> visitorCallback =
                     ParallelVisitor.createParallelVisitorCallback(
-                        new TransitiveTraversalValueDTCVisitor.Factory(
+                        new UnfilteredTransitiveTraversalValueDTCVisitor.Factory(
                             env,
                             env.createSkyKeyUniquifier(),
                             processResultsBatchSize,