Don't directly use the SkyQueryEnvironment's graph to find rdeps duri…

…ng a query. PiperOrigin-RevId: 288521382
JoulRoad · Jan 7, 2020 · 5e69f08 · 5e69f08
1 parent 1d6828a
commit 5e69f08
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 9 deletions.
diff --git a/src/main/java/com/google/devtools/build/lib/query2/RdepsBoundedVisitor.java b/src/main/java/com/google/devtools/build/lib/query2/RdepsBoundedVisitor.java
@@ -106,7 +106,7 @@ protected Visit getVisitResult(Iterable<DepAndRdepAtDepth> depAndRdepAtDepths)
     // Retrieve the reverse deps as SkyKeys and defer the targetification and filtering to next
     // recursive visitation.
     Map<SkyKey, Iterable<SkyKey>> unfilteredRdepsOfRdeps =
-        env.graph.getReverseDeps(uniqueValidRdepsBelowDepthBound);
+        env.getReverseDepLabelsOfLabels(uniqueValidRdepsBelowDepthBound);
 
     ImmutableList.Builder<DepAndRdepAtDepth> depAndRdepAtDepthsToVisitBuilder =
         ImmutableList.builder();

diff --git a/src/main/java/com/google/devtools/build/lib/query2/RdepsUnboundedVisitor.java b/src/main/java/com/google/devtools/build/lib/query2/RdepsUnboundedVisitor.java
@@ -104,8 +104,7 @@ protected Visit getVisitResult(Iterable<DepAndRdep> depAndRdeps)
     // need to filter out disallowed edges, but cannot do so before targetification occurs. This
     // means we may be wastefully visiting nodes via disallowed edges.
     ImmutableList.Builder<DepAndRdep> depAndRdepsToVisitBuilder = ImmutableList.builder();
-    env.graph
-        .getReverseDeps(uniqueValidRdeps)
+    env.getReverseDepLabelsOfLabels(uniqueValidRdeps)
         .entrySet()
         .forEach(
             reverseDepsEntry ->

diff --git a/src/main/java/com/google/devtools/build/lib/query2/SkyQueryEnvironment.java b/src/main/java/com/google/devtools/build/lib/query2/SkyQueryEnvironment.java
@@ -482,7 +482,12 @@ private Map<SkyKey, Collection<Target>> targetifyValues(
 
   private Map<SkyKey, Collection<Target>> getRawReverseDeps(
       Iterable<SkyKey> transitiveTraversalKeys) throws InterruptedException {
-    return targetifyValues(graph.getReverseDeps(transitiveTraversalKeys));
+    return targetifyValues(getReverseDepLabelsOfLabels(transitiveTraversalKeys));
+  }
+
+  protected Map<SkyKey, Iterable<SkyKey>> getReverseDepLabelsOfLabels(Iterable<SkyKey> labels)
+      throws InterruptedException {
+    return graph.getReverseDeps(labels);
   }
 
   private Set<Label> getAllowedDeps(Rule rule) throws InterruptedException {
@@ -549,14 +554,13 @@ protected Map<SkyKey, Iterable<SkyKey>> getFwdDepLabels(Iterable<SkyKey> targetL
   public Collection<Target> getReverseDeps(
       Iterable<Target> targets, QueryExpressionContext<Target> context)
       throws InterruptedException {
-    return getReverseDepsOfLabels(Iterables.transform(targets, Target::getLabel));
+    return processRawReverseDeps(
+        getReverseDepsOfLabels(Iterables.transform(targets, Target::getLabel)));
   }
 
-  protected Collection<Target> getReverseDepsOfLabels(Iterable<Label> targetLabels)
+  protected Map<SkyKey, Collection<Target>> getReverseDepsOfLabels(Iterable<Label> targetLabels)
       throws InterruptedException {
-    Map<SkyKey, Collection<Target>> rawReverseDeps =
-        getRawReverseDeps(Iterables.transform(targetLabels, label -> label));
-    return processRawReverseDeps(rawReverseDeps);
+    return getRawReverseDeps(Iterables.transform(targetLabels, label -> label));
   }
 
   /** Targetify SkyKeys of reverse deps and filter out targets whose deps are not allowed. */