commit 602cc856051b02328ed56e2af808b829dafecd4b
author shahan <shahan@google.com> Wed Jun 06 20:09:57 2018 -0700
committer Copybara-Service <copybara-piper@google.com> Wed Jun 06 20:11:33 2018 -0700
tree 3c7f8b6e3e672ad173204b7dec29b62b7becd4b8
parent 89d85ea3c515cb288a388d89673e773f6806d7fa

Refactoring: makes the code simpler by deleting Metadata and InputArtifactData.

(minor) ActionFS now implements MetadataProvider.getInput

PiperOrigin-RevId: 199575194

src/main/java/com/google/devtools/build/lib/skyframe/TreeArtifactValue.java

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/TreeArtifactValue.java b/src/main/java/com/google/devtools/build/lib/skyframe/TreeArtifactValue.java
index 4cf0014..b7ca908 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/TreeArtifactValue.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/TreeArtifactValue.java
@@ -21,8 +21,8 @@
 import com.google.common.collect.Maps;
 import com.google.devtools.build.lib.actions.Artifact;
 import com.google.devtools.build.lib.actions.Artifact.TreeFileArtifact;
+import com.google.devtools.build.lib.actions.FileArtifactValue;
 import com.google.devtools.build.lib.actions.cache.DigestUtils;
-import com.google.devtools.build.lib.actions.cache.Metadata;
 import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec;
 import com.google.devtools.build.lib.vfs.Path;
 import com.google.devtools.build.lib.vfs.PathFragment;
@@ -61,7 +61,7 @@
    * and their corresponding FileArtifactValues.
    */
   static TreeArtifactValue create(Map<TreeFileArtifact, FileArtifactValue> childFileValues) {
-    Map<String, Metadata> digestBuilder =
+    Map<String, FileArtifactValue> digestBuilder =
         Maps.newHashMapWithExpectedSize(childFileValues.size());
     for (Map.Entry<TreeFileArtifact, FileArtifactValue> e : childFileValues.entrySet()) {
       digestBuilder.put(e.getKey().getParentRelativePath().getPathString(), e.getValue());
@@ -76,7 +76,7 @@
     return FileArtifactValue.createProxy(digest);
   }
 
-  Metadata getMetadata() {
+  FileArtifactValue getMetadata() {
     return getSelfData();
   }
 
@@ -129,57 +129,57 @@
   }
 
   /**
-   * A TreeArtifactValue that represents a missing TreeArtifact.
-   * This is occasionally useful because Java's concurrent collections disallow null members.
+   * A TreeArtifactValue that represents a missing TreeArtifact. This is occasionally useful because
+   * Java's concurrent collections disallow null members.
    */
-  static final TreeArtifactValue MISSING_TREE_ARTIFACT = new TreeArtifactValue(null,
-      ImmutableMap.<TreeFileArtifact, FileArtifactValue>of()) {
-    @Override
-    FileArtifactValue getSelfData() {
-      throw new UnsupportedOperationException();
-    }
+  static final TreeArtifactValue MISSING_TREE_ARTIFACT =
+      new TreeArtifactValue(null, ImmutableMap.<TreeFileArtifact, FileArtifactValue>of()) {
+        @Override
+        FileArtifactValue getSelfData() {
+          throw new UnsupportedOperationException();
+        }
 
-    @Override
-    Iterable<TreeFileArtifact> getChildren() {
-      throw new UnsupportedOperationException();
-    }
+        @Override
+        Iterable<TreeFileArtifact> getChildren() {
+          throw new UnsupportedOperationException();
+        }
 
-    @Override
-    Map<TreeFileArtifact, FileArtifactValue> getChildValues() {
-      throw new UnsupportedOperationException();
-    }
+        @Override
+        Map<TreeFileArtifact, FileArtifactValue> getChildValues() {
+          throw new UnsupportedOperationException();
+        }
 
-    @Override
-    Metadata getMetadata() {
-      throw new UnsupportedOperationException();
-    }
+        @Override
+        FileArtifactValue getMetadata() {
+          throw new UnsupportedOperationException();
+        }
 
-    @Override
-    Set<PathFragment> getChildPaths() {
-      throw new UnsupportedOperationException();
-    }
+        @Override
+        Set<PathFragment> getChildPaths() {
+          throw new UnsupportedOperationException();
+        }
 
-    @Nullable
-    @Override
-    byte[] getDigest() {
-      throw new UnsupportedOperationException();
-    }
+        @Nullable
+        @Override
+        byte[] getDigest() {
+          throw new UnsupportedOperationException();
+        }
 
-    @Override
-    public int hashCode() {
-      return 24; // my favorite number
-    }
+        @Override
+        public int hashCode() {
+          return 24; // my favorite number
+        }
 
-    @Override
-    public boolean equals(Object other) {
-      return this == other;
-    }
+        @Override
+        public boolean equals(Object other) {
+          return this == other;
+        }
 
-    @Override
-    public String toString() {
-      return "MISSING_TREE_ARTIFACT";
-    }
-  };
+        @Override
+        public String toString() {
+          return "MISSING_TREE_ARTIFACT";
+        }
+      };
 
   private static void explodeDirectory(Artifact treeArtifact,
       PathFragment pathToExplode, ImmutableSet.Builder<PathFragment> valuesBuilder)