commit 33bab46ae38ef0dec7914bb4ca7b733a9feb435c
author Rumou Duan <rduan@google.com> Mon Apr 25 17:55:12 2016 +0000
committer Yun Peng <pcloudy@google.com> Tue Apr 26 08:29:19 2016 +0000
tree 5d10b6610a56bf8414313d842850026369264fcb
parent d9121976fa7b39372027c70edddf9eb3c0bba7a6

Split ActionMetadata into ActionAnalysisMetadata and ActionExecutionMetadata.
Except in action execution logic (ActionExecutionFunction, SkyframeActionExecutor, etc.), switch Action interface references to either ActionAnalysisMetadata if possible or ActionExecutionMetadata.

--
MOS_MIGRATED_REVID=120723431

src/test/java/com/google/devtools/build/lib/actions/ArtifactTest.java

diff --git a/src/test/java/com/google/devtools/build/lib/actions/ArtifactTest.java b/src/test/java/com/google/devtools/build/lib/actions/ArtifactTest.java
index ae2d09a..e43ddd1 100644
--- a/src/test/java/com/google/devtools/build/lib/actions/ArtifactTest.java
+++ b/src/test/java/com/google/devtools/build/lib/actions/ArtifactTest.java
@@ -24,7 +24,7 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
-import com.google.devtools.build.lib.actions.Action.MiddlemanType;
+import com.google.devtools.build.lib.actions.ActionAnalysisMetadata.MiddlemanType;
 import com.google.devtools.build.lib.actions.util.ActionsTestUtil;
 import com.google.devtools.build.lib.actions.util.LabelArtifactOwner;
 import com.google.devtools.build.lib.cmdline.Label;
@@ -209,7 +209,7 @@
 
     List<Artifact> manuallyExpanded = new ArrayList<>();
     for (Artifact artifact : original) {
-      Action action = actionGraph.getGeneratingAction(artifact);
+      ActionAnalysisMetadata action = actionGraph.getGeneratingAction(artifact);
       if (artifact.isMiddlemanArtifact()) {
         Iterables.addAll(manuallyExpanded, action.getInputs());
       } else {
@@ -260,7 +260,7 @@
 
     List<Artifact> manuallyExpanded = new ArrayList<>();
     for (Artifact artifact : original) {
-      Action action = actionGraph.getGeneratingAction(artifact);
+      ActionAnalysisMetadata action = actionGraph.getGeneratingAction(artifact);
       if (artifact.isMiddlemanArtifact()) {
         Iterables.addAll(manuallyExpanded, action.getInputs());
       } else {