Deletes ActionInputFileCache.

PiperOrigin-RevId: 199732415

5 files changed, 17 insertions, 17 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/exec/AbstractSpawnStrategy.java b/src/main/java/com/google/devtools/build/lib/exec/AbstractSpawnStrategy.java
index 6745b1a96e..c94cd491d5 100644
--- a/src/main/java/com/google/devtools/build/lib/exec/AbstractSpawnStrategy.java
+++ b/src/main/java/com/google/devtools/build/lib/exec/AbstractSpawnStrategy.java
@@ -20,11 +20,11 @@ import com.google.common.eventbus.EventBus;
 import com.google.devtools.build.lib.actions.ActionExecutionContext;
 import com.google.devtools.build.lib.actions.ActionExecutionMetadata;
 import com.google.devtools.build.lib.actions.ActionInput;
-import com.google.devtools.build.lib.actions.ActionInputFileCache;
 import com.google.devtools.build.lib.actions.ActionStatusMessage;
 import com.google.devtools.build.lib.actions.Artifact.ArtifactExpander;
 import com.google.devtools.build.lib.actions.EnvironmentalExecException;
 import com.google.devtools.build.lib.actions.ExecException;
+import com.google.devtools.build.lib.actions.MetadataProvider;
 import com.google.devtools.build.lib.actions.SandboxedSpawnActionContext;
 import com.google.devtools.build.lib.actions.Spawn;
 import com.google.devtools.build.lib.actions.SpawnActionContext;
@@ -111,7 +111,7 @@ public abstract class AbstractSpawnStrategy implements SandboxedSpawnActionConte
       try {
         spawnLogContext.logSpawn(
             spawn,
-            actionExecutionContext.getActionInputFileCache(),
+            actionExecutionContext.getMetadataProvider(),
             context.getInputMapping(),
             context.getTimeout(),
             spawnResult);
@@ -180,8 +180,8 @@ public abstract class AbstractSpawnStrategy implements SandboxedSpawnActionConte
     }
 
     @Override
-    public ActionInputFileCache getActionInputFileCache() {
-      return actionExecutionContext.getActionInputFileCache();
+    public MetadataProvider getMetadataProvider() {
+      return actionExecutionContext.getMetadataProvider();
     }
 
     @Override
@@ -221,7 +221,7 @@ public abstract class AbstractSpawnStrategy implements SandboxedSpawnActionConte
             spawnInputExpander.getInputMapping(
                 spawn,
                 actionExecutionContext.getArtifactExpander(),
-                actionExecutionContext.getActionInputFileCache());
+                actionExecutionContext.getMetadataProvider());
       }
       return lazyInputMapping;
     }
diff --git a/src/main/java/com/google/devtools/build/lib/exec/ActionContextProvider.java b/src/main/java/com/google/devtools/build/lib/exec/ActionContextProvider.java
index f2f5e0f6fb..79ea2cdf49 100644
--- a/src/main/java/com/google/devtools/build/lib/exec/ActionContextProvider.java
+++ b/src/main/java/com/google/devtools/build/lib/exec/ActionContextProvider.java
@@ -15,9 +15,9 @@ package com.google.devtools.build.lib.exec;
 
 import com.google.devtools.build.lib.actions.ActionContext;
 import com.google.devtools.build.lib.actions.ActionGraph;
-import com.google.devtools.build.lib.actions.ActionInputFileCache;
 import com.google.devtools.build.lib.actions.Artifact;
 import com.google.devtools.build.lib.actions.ExecutorInitException;
+import com.google.devtools.build.lib.actions.MetadataProvider;
 
 /**
  * An object that provides execution strategies to {@link BlazeExecutor}.
@@ -35,13 +35,12 @@ public abstract class ActionContextProvider {
 
   /**
    * Two-phase initialization. The input file cache usually comes from a different module than the
-   * {@link ActionContextProvider} instances that require it, so this method is called after
-   * {@link com.google.devtools.build.lib.runtime.BlazeModule#executorInit}.
+   * {@link ActionContextProvider} instances that require it, so this method is called after {@link
+   * com.google.devtools.build.lib.runtime.BlazeModule#executorInit}.
    *
    * @param actionInputFileCache the input file cache
    */
-  public void init(ActionInputFileCache actionInputFileCache) {
-  }
+  public void init(MetadataProvider actionInputFileCache) {}
 
   /**
    * Called when the executor is constructed. The parameter contains all the contexts that were
diff --git a/src/main/java/com/google/devtools/build/lib/exec/SingleBuildFileCache.java b/src/main/java/com/google/devtools/build/lib/exec/SingleBuildFileCache.java
index 10a816c886..683024e7a7 100644
--- a/src/main/java/com/google/devtools/build/lib/exec/SingleBuildFileCache.java
+++ b/src/main/java/com/google/devtools/build/lib/exec/SingleBuildFileCache.java
@@ -16,10 +16,10 @@ package com.google.devtools.build.lib.exec;
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
 import com.google.devtools.build.lib.actions.ActionInput;
-import com.google.devtools.build.lib.actions.ActionInputFileCache;
 import com.google.devtools.build.lib.actions.Artifact;
 import com.google.devtools.build.lib.actions.DigestOfDirectoryException;
 import com.google.devtools.build.lib.actions.FileArtifactValue;
+import com.google.devtools.build.lib.actions.MetadataProvider;
 import com.google.devtools.build.lib.vfs.FileSystem;
 import com.google.devtools.build.lib.vfs.Path;
 import java.io.IOException;
@@ -33,7 +33,7 @@ import javax.annotation.concurrent.ThreadSafe;
  * <p>Simply maintains a cached mapping from filename to metadata that may be populated only once.
  */
 @ThreadSafe
-public class SingleBuildFileCache implements ActionInputFileCache {
+public class SingleBuildFileCache implements MetadataProvider {
   private final Path execRoot;
 
   public SingleBuildFileCache(String cwd, FileSystem fs) {
diff --git a/src/main/java/com/google/devtools/build/lib/exec/SpawnInputExpander.java b/src/main/java/com/google/devtools/build/lib/exec/SpawnInputExpander.java
index 0fa9c978ee..444ffa51b6 100644
--- a/src/main/java/com/google/devtools/build/lib/exec/SpawnInputExpander.java
+++ b/src/main/java/com/google/devtools/build/lib/exec/SpawnInputExpander.java
@@ -17,11 +17,11 @@ import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
 import com.google.devtools.build.lib.actions.ActionInput;
-import com.google.devtools.build.lib.actions.ActionInputFileCache;
 import com.google.devtools.build.lib.actions.ActionInputHelper;
 import com.google.devtools.build.lib.actions.Artifact;
 import com.google.devtools.build.lib.actions.Artifact.ArtifactExpander;
 import com.google.devtools.build.lib.actions.FilesetOutputSymlink;
+import com.google.devtools.build.lib.actions.MetadataProvider;
 import com.google.devtools.build.lib.actions.RunfilesSupplier;
 import com.google.devtools.build.lib.actions.Spawn;
 import com.google.devtools.build.lib.actions.cache.VirtualActionInput.EmptyActionInput;
@@ -103,7 +103,8 @@ public class SpawnInputExpander {
   void addRunfilesToInputs(
       Map<PathFragment, ActionInput> inputMap,
       RunfilesSupplier runfilesSupplier,
-      ActionInputFileCache actionFileCache) throws IOException {
+      MetadataProvider actionFileCache)
+      throws IOException {
     Map<PathFragment, Map<PathFragment, Artifact>> rootsAndMappings = null;
     rootsAndMappings = runfilesSupplier.getMappings();
 
@@ -180,7 +181,7 @@ public class SpawnInputExpander {
    * com.google.devtools.build.lib.actions.cache.VirtualActionInput}.
    */
   public SortedMap<PathFragment, ActionInput> getInputMapping(
-      Spawn spawn, ArtifactExpander artifactExpander, ActionInputFileCache actionInputFileCache)
+      Spawn spawn, ArtifactExpander artifactExpander, MetadataProvider actionInputFileCache)
       throws IOException {
     TreeMap<PathFragment, ActionInput> inputMap = new TreeMap<>();
     addInputs(inputMap, spawn, artifactExpander);
diff --git a/src/main/java/com/google/devtools/build/lib/exec/SpawnRunner.java b/src/main/java/com/google/devtools/build/lib/exec/SpawnRunner.java
index 5ed43cd14e..af391d5426 100644
--- a/src/main/java/com/google/devtools/build/lib/exec/SpawnRunner.java
+++ b/src/main/java/com/google/devtools/build/lib/exec/SpawnRunner.java
@@ -14,9 +14,9 @@
 package com.google.devtools.build.lib.exec;
 
 import com.google.devtools.build.lib.actions.ActionInput;
-import com.google.devtools.build.lib.actions.ActionInputFileCache;
 import com.google.devtools.build.lib.actions.Artifact.ArtifactExpander;
 import com.google.devtools.build.lib.actions.ExecException;
+import com.google.devtools.build.lib.actions.MetadataProvider;
 import com.google.devtools.build.lib.actions.Spawn;
 import com.google.devtools.build.lib.actions.SpawnResult;
 import com.google.devtools.build.lib.util.io.FileOutErr;
@@ -159,7 +159,7 @@ public interface SpawnRunner {
      * The input file metadata cache for this specific spawn, which can be used to efficiently
      * obtain file digests and sizes.
      */
-    ActionInputFileCache getActionInputFileCache();
+    MetadataProvider getMetadataProvider();
 
     /** An artifact expander. */
     // TODO(ulfjack): This is only used for the sandbox runners to compute a set of empty