diff options
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/skyframe/ActionMetadataHandler.java')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/skyframe/ActionMetadataHandler.java | 20 |
1 files changed, 12 insertions, 8 deletions
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 b68930e492..af2a14347b 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 @@ -22,11 +22,14 @@ import com.google.common.collect.Sets; import com.google.common.io.BaseEncoding; import com.google.devtools.build.lib.actions.ActionInput; import com.google.devtools.build.lib.actions.ActionInputHelper; +import com.google.devtools.build.lib.actions.ActionInputMap; import com.google.devtools.build.lib.actions.Artifact; import com.google.devtools.build.lib.actions.Artifact.SpecialArtifact; import com.google.devtools.build.lib.actions.Artifact.TreeFileArtifact; +import com.google.devtools.build.lib.actions.FileArtifactValue; +import com.google.devtools.build.lib.actions.FileStateValue; +import com.google.devtools.build.lib.actions.FileValue; import com.google.devtools.build.lib.actions.cache.Md5Digest; -import com.google.devtools.build.lib.actions.cache.Metadata; import com.google.devtools.build.lib.actions.cache.MetadataHandler; import com.google.devtools.build.lib.util.io.TimestampGranularityMonitor; import com.google.devtools.build.lib.vfs.FileStatus; @@ -78,7 +81,7 @@ public class ActionMetadataHandler implements MetadataHandler { * * <p>This should never be read directly. Use {@link #getInputFileArtifactValue} instead. */ - private final InputArtifactData inputArtifactData; + private final ActionInputMap inputArtifactData; /** FileValues for each output Artifact. */ private final ConcurrentMap<Artifact, FileValue> outputArtifactData = @@ -130,7 +133,7 @@ public class ActionMetadataHandler implements MetadataHandler { @VisibleForTesting public ActionMetadataHandler( - InputArtifactData inputArtifactData, + ActionInputMap inputArtifactData, Iterable<Artifact> outputs, TimestampGranularityMonitor tsgm, ArtifactPathResolver artifactPathResolver) { @@ -153,7 +156,8 @@ public class ActionMetadataHandler implements MetadataHandler { return artifact.isConstantMetadata() ? null : tsgm; } - private static Metadata metadataFromValue(FileArtifactValue value) throws FileNotFoundException { + private static FileArtifactValue metadataFromValue(FileArtifactValue value) + throws FileNotFoundException { if (value == FileArtifactValue.MISSING_FILE_MARKER || value == FileArtifactValue.OMITTED_FILE_MARKER) { throw new FileNotFoundException(); @@ -171,11 +175,11 @@ public class ActionMetadataHandler implements MetadataHandler { return null; } - return inputArtifactData.get(input); + return inputArtifactData.getMetadata(input); } @Override - public Metadata getMetadata(Artifact artifact) throws IOException { + public FileArtifactValue getMetadata(Artifact artifact) throws IOException { FileArtifactValue value = getInputFileArtifactValue(artifact); if (value != null) { return metadataFromValue(value); @@ -248,8 +252,8 @@ public class ActionMetadataHandler implements MetadataHandler { * for normal (non-middleman) artifacts. */ @Nullable - private Metadata maybeStoreAdditionalData(Artifact artifact, FileValue data, - @Nullable byte[] injectedDigest) throws IOException { + private FileArtifactValue maybeStoreAdditionalData( + Artifact artifact, FileValue data, @Nullable byte[] injectedDigest) throws IOException { if (!data.exists()) { // Nonexistent files should only occur before executing an action. throw new FileNotFoundException(artifact.prettyPrint() + " does not exist"); |