commit d8dde88207b4c739c74f855b2bc693f3233383b5
author shreyax <shreyax@google.com> Tue Feb 19 19:40:04 2019 -0800
committer Copybara-Service <copybara-worker@google.com> Tue Feb 19 19:41:51 2019 -0800
tree 289f29de8770fa966b360633a5eebc6dd21e8a58
parent a72e3139e8ebdd4a4bebcd515858dc109f4d8b3e

Implement the rdeps predicate directly for RBuildFilesVisitor.

PiperOrigin-RevId: 234722492

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 a9a0aca..1f5e55a 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
@@ -31,7 +31,6 @@
 import com.google.devtools.build.lib.query2.engine.QueryExpressionContext;
 import com.google.devtools.build.lib.query2.engine.QueryUtil;
 import com.google.devtools.build.lib.query2.engine.QueryUtil.AggregateAllCallback;
-import com.google.devtools.build.lib.skyframe.SkyFunctions;
 import com.google.devtools.build.lib.vfs.PathFragment;
 import com.google.devtools.build.skyframe.SkyKey;
 import java.util.Collection;
@@ -172,14 +171,7 @@
             /*visitUniquifier=*/ env.createSkyKeyUniquifier(),
             /*resultUniquifier=*/ env.createSkyKeyUniquifier(),
             context,
-            callback,
-            /*rdepFilter=*/ rdep ->
-                // Packages may depend on the existence of subpackages, but these edges aren't
-                // relevant to rbuildfiles. They may also depend on files transitively through
-                // globs, but these cannot be included in load statements and so we don't traverse
-                // through these either.
-                !rdep.functionName().equals(SkyFunctions.PACKAGE_LOOKUP)
-                    && !rdep.functionName().equals(SkyFunctions.GLOB));
+            callback);
     visitor.visitAndWaitForCompletion(env.getFileStateKeysForFileFragments(fileIdentifiers));
   }