diff options
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/exec')
3 files changed, 11 insertions, 14 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/exec/BinTools.java b/src/main/java/com/google/devtools/build/lib/exec/BinTools.java index c754386c56..651fea5238 100644 --- a/src/main/java/com/google/devtools/build/lib/exec/BinTools.java +++ b/src/main/java/com/google/devtools/build/lib/exec/BinTools.java @@ -23,10 +23,9 @@ import com.google.common.io.ByteStreams; import com.google.devtools.build.lib.actions.ActionInput; import com.google.devtools.build.lib.actions.EnvironmentalExecException; import com.google.devtools.build.lib.actions.ExecException; -import com.google.devtools.build.lib.actions.cache.Metadata; +import com.google.devtools.build.lib.actions.FileArtifactValue; import com.google.devtools.build.lib.actions.cache.VirtualActionInput; import com.google.devtools.build.lib.analysis.BlazeDirectories; -import com.google.devtools.build.lib.skyframe.FileArtifactValue; import com.google.devtools.build.lib.vfs.Dirent; import com.google.devtools.build.lib.vfs.FileSystem.HashFunction; import com.google.devtools.build.lib.vfs.FileSystemUtils; @@ -231,7 +230,7 @@ public final class BinTools { public static final class PathActionInput implements VirtualActionInput { private final Path path; private final PathFragment execPath; - private Metadata metadata; + private FileArtifactValue metadata; public PathActionInput(Path path, PathFragment execPath) { this.path = path; @@ -253,7 +252,7 @@ public final class BinTools { } @Override - public synchronized Metadata getMetadata() throws IOException { + public synchronized FileArtifactValue getMetadata() throws IOException { // We intentionally delay hashing until it is necessary. if (metadata == null) { metadata = hash(path); @@ -261,7 +260,7 @@ public final class BinTools { return metadata; } - private static Metadata hash(Path path) throws IOException { + private static FileArtifactValue hash(Path path) throws IOException { HashFunction hashFn = path.getFileSystem().getDigestFunction(); Hasher hasher = hashFn.getHash().newHasher(); int bytesCopied = 0; diff --git a/src/main/java/com/google/devtools/build/lib/exec/SingleBuildFileCache.java b/src/main/java/com/google/devtools/build/lib/exec/SingleBuildFileCache.java index 073e3d989c..10a816c886 100644 --- a/src/main/java/com/google/devtools/build/lib/exec/SingleBuildFileCache.java +++ b/src/main/java/com/google/devtools/build/lib/exec/SingleBuildFileCache.java @@ -19,8 +19,7 @@ import com.google.devtools.build.lib.actions.ActionInput; import com.google.devtools.build.lib.actions.ActionInputFileCache; import com.google.devtools.build.lib.actions.Artifact; import com.google.devtools.build.lib.actions.DigestOfDirectoryException; -import com.google.devtools.build.lib.actions.cache.Metadata; -import com.google.devtools.build.lib.skyframe.FileArtifactValue; +import com.google.devtools.build.lib.actions.FileArtifactValue; import com.google.devtools.build.lib.vfs.FileSystem; import com.google.devtools.build.lib.vfs.Path; import java.io.IOException; @@ -55,7 +54,7 @@ public class SingleBuildFileCache implements ActionInputFileCache { .build(); @Override - public Metadata getMetadata(ActionInput input) throws IOException { + public FileArtifactValue getMetadata(ActionInput input) throws IOException { try { return pathToMetadata .get( @@ -95,11 +94,11 @@ public class SingleBuildFileCache implements ActionInputFileCache { /** Container class for caching I/O around ActionInputs. */ private static class ActionInputMetadata { private final ActionInput input; - private final Metadata metadata; + private final FileArtifactValue metadata; private final IOException exceptionOnAccess; /** Constructor for a successful lookup. */ - ActionInputMetadata(ActionInput input, Metadata metadata) { + ActionInputMetadata(ActionInput input, FileArtifactValue metadata) { this.input = input; this.metadata = metadata; this.exceptionOnAccess = null; @@ -112,7 +111,7 @@ public class SingleBuildFileCache implements ActionInputFileCache { this.metadata = null; } - Metadata getMetadata() throws IOException { + FileArtifactValue getMetadata() throws IOException { maybeRaiseException(); return metadata; } 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) { |