Fix SkyQuery bug where we weren't respecting the package blacklist. We do this by changing both the relevant Skyframe and the SkyQuery code to propagate (minimal!) blacklist information in the SkyKeys themselves.

There are other approaches to solving this problem, but I like how this solution doesn't involve duplication of logic. Also, it has the following nice benefit: previously, RecursiveDirectoryTraversalFunction would declare a dep on the blacklist for every directory traversed which adds an edge for each directory traversed.

--
MOS_MIGRATED_REVID=120049635

1 files changed, 16 insertions, 0 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/TargetPatternValue.java b/src/main/java/com/google/devtools/build/lib/skyframe/TargetPatternValue.java
index f247bdeda6..c19a72b790 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/TargetPatternValue.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/TargetPatternValue.java
@@ -18,6 +18,7 @@ import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Iterables;
 import com.google.devtools.build.lib.cmdline.Label;
 import com.google.devtools.build.lib.cmdline.LabelSyntaxException;
+import com.google.devtools.build.lib.cmdline.PackageIdentifier;
 import com.google.devtools.build.lib.cmdline.ResolvedTargets;
 import com.google.devtools.build.lib.cmdline.ResolvedTargets.Builder;
 import com.google.devtools.build.lib.cmdline.TargetParsingException;
@@ -205,6 +206,21 @@ public final class TargetPatternValue implements SkyValue {
       return excludedSubdirectories;
     }
 
+    public ImmutableSet<PathFragment> getAllSubdirectoriesToExclude(
+        Iterable<PathFragment> blacklistedPackagePrefixes) {
+      ImmutableSet.Builder<PathFragment> excludedPathsBuilder = ImmutableSet.builder();
+      excludedPathsBuilder.addAll(getExcludedSubdirectories());
+      for (PathFragment blacklistedPackagePrefix : blacklistedPackagePrefixes) {
+        PackageIdentifier pkgIdForBlacklistedDirectorPrefix = PackageIdentifier.create(
+            parsedPattern.getDirectory().getRepository(),
+            blacklistedPackagePrefix);
+        if (parsedPattern.containsBelowDirectory(pkgIdForBlacklistedDirectorPrefix)) {
+          excludedPathsBuilder.add(blacklistedPackagePrefix);
+        }
+      }
+      return excludedPathsBuilder.build();
+    }
+
     @Override
     public String toString() {
       return (isNegative ? "-" : "") + parsedPattern.getOriginalPattern();