Drop Filesets from artifact groups, as we can never construct a valid…

… pointer to them. PiperOrigin-RevId: 227165800
bazelbuild · Dec 28, 2018 · 2765ca4 · 2765ca4
1 parent 21c2582
commit 2765ca4
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 5 deletions.
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/TargetCompleteEvent.java b/src/main/java/com/google/devtools/build/lib/analysis/TargetCompleteEvent.java
@@ -248,7 +248,10 @@ public Iterable<Artifact> getLegacyFilteredImportantArtifacts() {
     }
     return Iterables.filter(
         builder.build(),
-        (artifact) -> !artifact.isSourceArtifact() && !artifact.isMiddlemanArtifact());
+        (artifact) ->
+            !artifact.isSourceArtifact()
+                && !artifact.isMiddlemanArtifact()
+                && !artifact.isFileset());
   }
 
   @Override
@@ -309,13 +312,17 @@ public Collection<LocalFile> referencedLocalFiles() {
     for (ArtifactsInOutputGroup group : outputs) {
       if (group.areImportant()) {
         for (Artifact artifact : group.getArtifacts()) {
-          builder.add(new LocalFile(pathResolver.toPath(artifact), LocalFileType.OUTPUT));
+          if (!artifact.isFileset()) {
+            builder.add(new LocalFile(pathResolver.toPath(artifact), LocalFileType.OUTPUT));
+          }
         }
       }
     }
     if (baselineCoverageArtifacts != null) {
       for (Artifact artifact : baselineCoverageArtifacts) {
-        builder.add(new LocalFile(pathResolver.toPath(artifact), LocalFileType.OUTPUT));
+        if (!artifact.isFileset()) {
+          builder.add(new LocalFile(pathResolver.toPath(artifact), LocalFileType.OUTPUT));
+        }
       }
     }
     return builder.build();

diff --git a/src/main/java/com/google/devtools/build/lib/runtime/NamedArtifactGroup.java b/src/main/java/com/google/devtools/build/lib/runtime/NamedArtifactGroup.java
@@ -61,7 +61,7 @@ public Collection<LocalFile> referencedLocalFiles() {
     // This has to be consistent with the code below.
     ImmutableList.Builder<LocalFile> artifacts = ImmutableList.builder();
     for (Artifact artifact : view.directs()) {
-      if (artifact.isMiddlemanArtifact()) {
+      if (artifact.isMiddlemanArtifact() || artifact.isFileset()) {
         continue;
       }
       artifacts.add(new LocalFile(pathResolver.toPath(artifact), LocalFileType.OUTPUT));
@@ -78,7 +78,7 @@ public BuildEventStreamProtos.BuildEvent asStreamProto(BuildEventContext convert
         BuildEventStreamProtos.NamedSetOfFiles.newBuilder();
     for (Artifact artifact : view.directs()) {
       // We never want to report middleman artifacts. They are for internal use only.
-      if (artifact.isMiddlemanArtifact()) {
+      if (artifact.isMiddlemanArtifact() || artifact.isFileset()) {
         continue;
       }
       String name = artifact.getRootRelativePathString();

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java
@@ -346,6 +346,7 @@ public ArtifactPathResolver createPathResolverForArtifactValues(
       Preconditions.checkState(shouldCreatePathResolverForArtifactValues());
       return outputService.createPathResolverForArtifactValues(
           directories.getExecRoot().asFragment(),
+          directories.getRelativeOutputPath(),
           fileSystem,
           getPathEntries(),
           actionInputMap,

diff --git a/src/main/java/com/google/devtools/build/lib/vfs/OutputService.java b/src/main/java/com/google/devtools/build/lib/vfs/OutputService.java
@@ -159,6 +159,7 @@ default boolean supportsPathResolverForArtifactValues() {
 
   default ArtifactPathResolver createPathResolverForArtifactValues(
       PathFragment execRoot,
+      String relativeOutputPath,
       FileSystem fileSystem,
       ImmutableList<Root> pathEntries,
       ActionInputMap actionInputMap,