diff options
| author |  shahan <shahan@google.com> | 2018-06-06 20:09:57 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-06-06 20:11:33 -0700 |
| commit | 602cc856051b02328ed56e2af808b829dafecd4b (patch) | |
| tree | 3c7f8b6e3e672ad173204b7dec29b62b7becd4b8 /src/main/java/com/google/devtools/build/lib/exec/SpawnLogContext.java | |
| parent | 89d85ea3c515cb288a388d89673e773f6806d7fa (diff) | |
Refactoring: makes the code simpler by deleting Metadata and InputArtifactData.
(minor) ActionFS now implements MetadataProvider.getInput
PiperOrigin-RevId: 199575194
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/exec/SpawnLogContext.java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/exec/SpawnLogContext.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/exec/SpawnLogContext.java b/src/main/java/com/google/devtools/build/lib/exec/SpawnLogContext.java index c5952350bc..89d91e4b68 100644 --- a/src/main/java/com/google/devtools/build/lib/exec/SpawnLogContext.java +++ b/src/main/java/com/google/devtools/build/lib/exec/SpawnLogContext.java @@ -18,11 +18,11 @@ import com.google.common.hash.HashCode; import com.google.devtools.build.lib.actions.ActionContext; import com.google.devtools.build.lib.actions.ActionInput; import com.google.devtools.build.lib.actions.ExecutionStrategy; +import com.google.devtools.build.lib.actions.FileArtifactValue; import com.google.devtools.build.lib.actions.MetadataProvider; import com.google.devtools.build.lib.actions.Spawn; import com.google.devtools.build.lib.actions.SpawnResult; import com.google.devtools.build.lib.actions.Spawns; -import com.google.devtools.build.lib.actions.cache.Metadata; import com.google.devtools.build.lib.actions.cache.VirtualActionInput; import com.google.devtools.build.lib.analysis.platform.PlatformInfo; import com.google.devtools.build.lib.cmdline.Label; @@ -39,7 +39,6 @@ import com.google.devtools.build.lib.vfs.Symlinks; import com.google.protobuf.TextFormat; import com.google.protobuf.TextFormat.ParseException; import java.io.ByteArrayOutputStream; - import java.io.IOException; import java.time.Duration; import java.util.ArrayList; @@ -228,7 +227,7 @@ public class SpawnLogContext implements ActionContext { } // Try to access the cached metadata, otherwise fall back to local computation. try { - Metadata metadata = metadataProvider.getMetadata(input); + FileArtifactValue metadata = metadataProvider.getMetadata(input); if (metadata != null) { byte[] hash = metadata.getDigest(); if (hash != null) { |