RemoteFileArtifactValue no longer tracks mtime.

PiperOrigin-RevId: 197924560

3 files changed, 8 insertions, 15 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/actions/cache/MetadataHandler.java b/src/main/java/com/google/devtools/build/lib/actions/cache/MetadataHandler.java
index 5bda51aed7..fc7e8b9983 100644
--- a/src/main/java/com/google/devtools/build/lib/actions/cache/MetadataHandler.java
+++ b/src/main/java/com/google/devtools/build/lib/actions/cache/MetadataHandler.java
@@ -59,8 +59,7 @@ public interface MetadataHandler {
   void injectDigest(ActionInput output, FileStatus statNoFollow, byte[] digest);
 
   /** Injects a file that is only stored remotely. */
-  void injectRemoteFile(
-      Artifact output, byte[] digest, long size, long modifiedTime, int locationIndex);
+  void injectRemoteFile(Artifact output, byte[] digest, long size, int locationIndex);
 
   /**
    * Marks an artifact as intentionally omitted. Acknowledges that this Artifact could have existed,
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/ActionMetadataHandler.java b/src/main/java/com/google/devtools/build/lib/skyframe/ActionMetadataHandler.java
index 6e992960e4..f3f7e09049 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/ActionMetadataHandler.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/ActionMetadataHandler.java
@@ -468,8 +468,7 @@ public class ActionMetadataHandler implements MetadataHandler {
   }
 
   @Override
-  public void injectRemoteFile(
-      Artifact output, byte[] digest, long size, long modifiedTime, int locationIndex) {
+  public void injectRemoteFile(Artifact output, byte[] digest, long size, int locationIndex) {
     Preconditions.checkState(
         executionMode.get(), "Tried to inject %s outside of execution.", output);
     Preconditions.checkArgument(
@@ -487,8 +486,7 @@ public class ActionMetadataHandler implements MetadataHandler {
     // `locationIndex` to `FileStateValue`.
     try {
       injectOutputData(
-          output,
-          new FileArtifactValue.RemoteFileArtifactValue(digest, size, modifiedTime, locationIndex));
+          output, new FileArtifactValue.RemoteFileArtifactValue(digest, size, locationIndex));
     } catch (IOException e) {
       throw new IllegalStateException(e); // Should never happen.
     }
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/FileArtifactValue.java b/src/main/java/com/google/devtools/build/lib/skyframe/FileArtifactValue.java
index fbbdca186e..8786a75909 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/FileArtifactValue.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/FileArtifactValue.java
@@ -241,13 +241,11 @@ public abstract class FileArtifactValue implements SkyValue, Metadata {
   static final class RemoteFileArtifactValue extends FileArtifactValue {
     private final byte[] digest;
     private final long size;
-    private final long modifiedTime;
     private final int locationIndex;
 
-    RemoteFileArtifactValue(byte[] digest, long size, long modifiedTime, int locationIndex) {
+    RemoteFileArtifactValue(byte[] digest, long size, int locationIndex) {
       this.digest = digest;
       this.size = size;
-      this.modifiedTime = modifiedTime;
       this.locationIndex = locationIndex;
     }
 
@@ -268,7 +266,8 @@ public abstract class FileArtifactValue implements SkyValue, Metadata {
 
     @Override
     public long getModifiedTime() {
-      return modifiedTime;
+      throw new UnsupportedOperationException(
+          "RemoteFileArifactValue doesn't support getModifiedTime");
     }
 
     @Override
@@ -285,15 +284,12 @@ public abstract class FileArtifactValue implements SkyValue, Metadata {
         return false;
       }
       RemoteFileArtifactValue r = (RemoteFileArtifactValue) o;
-      return Arrays.equals(digest, r.digest)
-          && size == r.size
-          && modifiedTime == r.modifiedTime
-          && locationIndex == r.locationIndex;
+      return Arrays.equals(digest, r.digest) && size == r.size;
     }
 
     @Override
     public int hashCode() {
-      return Objects.hash(Arrays.hashCode(digest), size, modifiedTime, locationIndex);
+      return Objects.hash(Arrays.hashCode(digest), size);
     }
 
     @Override