Mostly-automated roll-forward to return ActionInput objects from the ActionInputFileCache when given a digest to do a reverse lookup so that metadata can be more easily retrieved.

Discovered inputs are no longer ever put into SingleBuildFileCache, so it is safe to roll this forward now

Because of code changes (meant to ensure the safety of this change), there were conflicts that had to be manually resolved.

--
MOS_MIGRATED_REVID=90425783

1 files changed, 7 insertions, 3 deletions

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 8ec1e51583..64df5c166b 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
@@ -99,9 +99,13 @@ public class SingleBuildFileCache implements ActionInputFileCache {
 
   @Nullable
   @Override
-  public File getFileFromDigest(ByteString digest) {
-    ActionInput relPath = digestToPath.get(digest);
-    return relPath == null ? null : new File(fullPath(relPath));
+  public ActionInput getInputFromDigest(ByteString digest) {
+    return digestToPath.get(digest);
+  }
+
+  @Override
+  public Path getInputPath(ActionInput input) {
+    return fs.getPath(fullPath(input));
   }
 
   @Override