commit 6c399d642d3451d6cd22009118f64f50ccaefd6a
author felly <felly@google.com> Wed Jul 18 15:55:59 2018 -0700
committer Copybara-Service <copybara-piper@google.com> Wed Jul 18 15:57:34 2018 -0700
tree 5588d7115dc6a55d4658e02ae477dc2433cedbf3
parent 64ea3cd90e1ead5ece533ee5a3cb4ee3520527fb

Introduce --strict_fileset_output which treats all output Artifacts encountered in a Fileset as a regular file.

PiperOrigin-RevId: 205152271

src/main/java/com/google/devtools/build/lib/skyframe/RecursiveFilesystemTraversalFunction.java

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/RecursiveFilesystemTraversalFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/RecursiveFilesystemTraversalFunction.java
index 070b831..c4a23b3 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/RecursiveFilesystemTraversalFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/RecursiveFilesystemTraversalFunction.java
@@ -245,33 +245,38 @@
         }
       }
 
-      // FileArtifactValue does not currently track symlinks. If it did, we could potentially remove
-      // some of the filesystem operations we're doing here.
-      Path path = traversal.root.asRootedPath().asPath();
-      FileStatus noFollowStat = path.stat(Symlinks.NOFOLLOW);
-      FileStatus followStat = path.statIfFound(Symlinks.FOLLOW);
-      FileType type;
-      PathFragment unresolvedLinkTarget = null;
       RootedPath realPath = traversal.root.asRootedPath();
-      if (followStat == null) {
-        type = FileType.DANGLING_SYMLINK;
-        if (!noFollowStat.isSymbolicLink()) {
-          throw new IOException("Expected symlink for " + path + ", but got: " + noFollowStat);
-        }
-        unresolvedLinkTarget = path.readSymbolicLink();
-      } else if (noFollowStat.isFile()) {
-        type = FileType.FILE;
-      } else if (noFollowStat.isDirectory()) {
-        type = FileType.DIRECTORY;
+      if (traversal.strictOutputFiles) {
+        Preconditions.checkNotNull(fsVal, "Strict Fileset output tree has null FileArtifactValue");
+        return new FileInfo(FileType.FILE, fsVal, realPath, null);
       } else {
-        unresolvedLinkTarget = path.readSymbolicLink();
-        realPath = RootedPath.toRootedPath(
-            Root.absoluteRoot(path.getFileSystem()),
-            path.resolveSymbolicLinks());
-        type = followStat.isFile() ? FileType.SYMLINK_TO_FILE : FileType.SYMLINK_TO_DIRECTORY;
+        // FileArtifactValue does not currently track symlinks. If it did, we could potentially
+        // remove some of the filesystem operations we're doing here.
+        Path path = traversal.root.asRootedPath().asPath();
+        FileStatus noFollowStat = path.stat(Symlinks.NOFOLLOW);
+        FileStatus followStat = path.statIfFound(Symlinks.FOLLOW);
+        FileType type;
+        PathFragment unresolvedLinkTarget = null;
+        if (followStat == null) {
+          type = FileType.DANGLING_SYMLINK;
+          if (!noFollowStat.isSymbolicLink()) {
+            throw new IOException("Expected symlink for " + path + ", but got: " + noFollowStat);
+          }
+          unresolvedLinkTarget = path.readSymbolicLink();
+        } else if (noFollowStat.isFile()) {
+          type = FileType.FILE;
+        } else if (noFollowStat.isDirectory()) {
+          type = FileType.DIRECTORY;
+        } else {
+          unresolvedLinkTarget = path.readSymbolicLink();
+          realPath =
+              RootedPath.toRootedPath(
+                  Root.absoluteRoot(path.getFileSystem()), path.resolveSymbolicLinks());
+          type = followStat.isFile() ? FileType.SYMLINK_TO_FILE : FileType.SYMLINK_TO_DIRECTORY;
+        }
+        return new FileInfo(
+            type, fsVal != null ? fsVal : noFollowStat.hashCode(), realPath, unresolvedLinkTarget);
       }
-      return new FileInfo(
-          type, fsVal != null ? fsVal : noFollowStat.hashCode(), realPath, unresolvedLinkTarget);
     } else {
       // Stat the file.
       FileValue fileValue =