commit d3d86440e90a8cef8483dec83f06c8a6f644603e
author felly <felly@google.com> Fri Jun 08 18:29:43 2018 -0700
committer Copybara-Service <copybara-piper@google.com> Fri Jun 08 18:31:22 2018 -0700
tree b825d979009bef6dbf3a8f8c9429cb002d607500
parent 3694136dc22d9653c6b58a547be7957668b12818

Unify path resolution codepaths.

RELNOTES: None
PiperOrigin-RevId: 199880252

src/main/java/com/google/devtools/build/lib/actions/ActionExecutionContext.java

diff --git a/src/main/java/com/google/devtools/build/lib/actions/ActionExecutionContext.java b/src/main/java/com/google/devtools/build/lib/actions/ActionExecutionContext.java
index 1db7c23..2aff663 100644
--- a/src/main/java/com/google/devtools/build/lib/actions/ActionExecutionContext.java
+++ b/src/main/java/com/google/devtools/build/lib/actions/ActionExecutionContext.java
@@ -59,6 +59,8 @@
 
   @Nullable private ImmutableList<FilesetOutputSymlink> outputSymlinks;
 
+  private final ArtifactPathResolver pathResolver;
+
   private ActionExecutionContext(
       Executor executor,
       MetadataProvider actionInputFileCache,
@@ -82,6 +84,9 @@
     this.artifactExpander = artifactExpander;
     this.env = env;
     this.actionFileSystem = actionFileSystem;
+    this.pathResolver = createPathResolver(actionFileSystem,
+        // executor is only ever null in testing.
+        executor == null ? null : executor.getExecRoot());
   }
 
   public ActionExecutionContext(
@@ -168,22 +173,25 @@
    * {@link Artifact.getRoot}.
    */
   public Path getInputPath(ActionInput input) {
-    if (input instanceof Artifact) {
-      Artifact artifact = (Artifact) input;
-      if (actionFileSystem != null) {
-        return actionFileSystem.getPath(artifact.getPath().getPathString());
-      }
-      return artifact.getPath();
-    }
-    return getExecRoot().getRelative(input.getExecPath());
+    return pathResolver.toPath(input);
   }
 
   public Root getRoot(Artifact artifact) {
-    if (actionFileSystem != null) {
-      return Root.fromPath(
-          actionFileSystem.getPath(artifact.getRoot().getRoot().asPath().getPathString()));
+    return pathResolver.transformRoot(artifact.getRoot().getRoot());
+  }
+
+  private static ArtifactPathResolver createPathResolver(FileSystem actionFileSystem,
+      Path execRoot) {
+    if (actionFileSystem == null) {
+      return ArtifactPathResolver.forExecRoot(execRoot);
+    } else {
+      return ArtifactPathResolver.withTransformedFileSystem(
+          actionFileSystem.getPath(execRoot.asFragment()));
     }
-    return artifact.getRoot().getRoot();
+  }
+
+  public ArtifactPathResolver getPathResolver() {
+    return pathResolver;
   }
 
   /**