Make Metadata an interface for FileArtifactValue

Replace all previous uses of Metadata with FileArtifactValue (or a simple inner
class in the case of ActionCacheChecker.CONSTANT_METADATA).

Care was taken to make the equals method obey the equals contract, even in the
presence of multiple implementations.

PiperOrigin-RevId: 160115080

3 files changed, 21 insertions, 12 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/actions/cache/CompactPersistentActionCacheTest.java b/src/test/java/com/google/devtools/build/lib/actions/cache/CompactPersistentActionCacheTest.java
index c2bf185d29..dfadf2072f 100644
--- a/src/test/java/com/google/devtools/build/lib/actions/cache/CompactPersistentActionCacheTest.java
+++ b/src/test/java/com/google/devtools/build/lib/actions/cache/CompactPersistentActionCacheTest.java
@@ -17,6 +17,7 @@ import static com.google.common.truth.Truth.assertThat;
 import static com.google.common.truth.Truth.assertWithMessage;
 
 import com.google.common.collect.ImmutableMap;
+import com.google.devtools.build.lib.skyframe.FileArtifactValue;
 import com.google.devtools.build.lib.testutil.Scratch;
 import com.google.devtools.build.lib.util.Clock;
 import com.google.devtools.build.lib.vfs.Path;
@@ -157,7 +158,7 @@ public class CompactPersistentActionCacheTest {
     ActionCache.Entry entry =
         new ActionCache.Entry("actionKey", ImmutableMap.<String, String>of(), false);
     entry.toString();
-    entry.addFile(PathFragment.create("foo/bar"), Metadata.CONSTANT_METADATA);
+    entry.addFile(PathFragment.create("foo/bar"), FileArtifactValue.createDirectory(1234));
     entry.toString();
     entry.getFileDigest();
     entry.toString();
diff --git a/src/test/java/com/google/devtools/build/lib/actions/cache/MetadataTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/FileArtifactValueTest.java
index 545871363a..641c28e283 100644
--- a/src/test/java/com/google/devtools/build/lib/actions/cache/MetadataTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/FileArtifactValueTest.java
@@ -11,18 +11,16 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-package com.google.devtools.build.lib.actions.cache;
-
+package com.google.devtools.build.lib.skyframe;
 
 import com.google.common.io.BaseEncoding;
 import com.google.common.testing.EqualsTester;
-
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 
 @RunWith(JUnit4.class)
-public class MetadataTest {
+public class FileArtifactValueTest {
 
   private static byte[] toBytes(String hex) {
     return BaseEncoding.base16().upperCase().decode(hex);
@@ -33,12 +31,20 @@ public class MetadataTest {
     // Each "equality group" is checked for equality within itself (including hashCode equality)
     // and inequality with members of other equality groups.
     new EqualsTester()
-        .addEqualityGroup(new Metadata(toBytes("00112233445566778899AABBCCDDEEFF")),
-                          new Metadata(toBytes("00112233445566778899AABBCCDDEEFF")))
-        .addEqualityGroup(new Metadata(1))
-        .addEqualityGroup(new Metadata(toBytes("FFFFFF00000000000000000000000000")))
-        .addEqualityGroup(new Metadata(2),
-                          new Metadata(2))
+        .addEqualityGroup(
+            FileArtifactValue.createNormalFile(toBytes("00112233445566778899AABBCCDDEEFF"), 1),
+            FileArtifactValue.createNormalFile(toBytes("00112233445566778899AABBCCDDEEFF"), 1))
+        .addEqualityGroup(
+            FileArtifactValue.createNormalFile(toBytes("00112233445566778899AABBCCDDEEFF"), 2))
+        .addEqualityGroup(FileArtifactValue.createDirectory(1))
+        .addEqualityGroup(
+            FileArtifactValue.createNormalFile(toBytes("FFFFFF00000000000000000000000000"), 1))
+        .addEqualityGroup(
+            FileArtifactValue.createDirectory(2),
+            FileArtifactValue.createDirectory(2))
+        .addEqualityGroup(FileArtifactValue.OMITTED_FILE_MARKER)
+        .addEqualityGroup(FileArtifactValue.MISSING_FILE_MARKER)
+        .addEqualityGroup(FileArtifactValue.DEFAULT_MIDDLEMAN)
         .addEqualityGroup("a string")
         .testEquals();
   }
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/TreeArtifactMetadataTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/TreeArtifactMetadataTest.java
index d8c2e403ce..b1d8b087ab 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/TreeArtifactMetadataTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/TreeArtifactMetadataTest.java
@@ -102,7 +102,9 @@ public class TreeArtifactMetadataTest extends ArtifactFunctionTestCase {
     // breaking changes.
     Map<String, Metadata> digestBuilder = new HashMap<>();
     for (PathFragment child : children) {
-      Metadata subdigest = new Metadata(tree.getPath().getRelative(child).getDigest());
+      Metadata subdigest = FileArtifactValue.createNormalFile(
+          tree.getPath().getRelative(child).getDigest(),
+          tree.getPath().getRelative(child).getFileSize());
       digestBuilder.put(child.getPathString(), subdigest);
     }
     assertThat(DigestUtils.fromMetadata(digestBuilder).getDigestBytesUnsafe())