diff options
author | shahan <shahan@google.com> | 2018-06-07 18:57:07 -0700 |
---|---|---|
committer | Copybara-Service <copybara-piper@google.com> | 2018-06-07 18:58:43 -0700 |
commit | 499503bbfe192f109f05270e5391265c0cd0966f (patch) | |
tree | 3ab01c638f6dca2e1167839864f5c734817b6a55 /src/main/java/com/google/devtools/build/lib/worker | |
parent | 1bef35d54d3f25a69a7055b3a5f19e425b54a4d1 (diff) |
Deletes ActionInputFileCache.
PiperOrigin-RevId: 199732415
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/worker')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/worker/WorkerFilesHash.java | 4 | ||||
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/worker/WorkerSpawnRunner.java | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/worker/WorkerFilesHash.java b/src/main/java/com/google/devtools/build/lib/worker/WorkerFilesHash.java index f35823a83e..f0246c3b37 100644 --- a/src/main/java/com/google/devtools/build/lib/worker/WorkerFilesHash.java +++ b/src/main/java/com/google/devtools/build/lib/worker/WorkerFilesHash.java @@ -19,11 +19,11 @@ import com.google.common.hash.HashCode; import com.google.common.hash.Hasher; import com.google.common.hash.Hashing; import com.google.devtools.build.lib.actions.ActionInput; -import com.google.devtools.build.lib.actions.ActionInputFileCache; import com.google.devtools.build.lib.actions.ActionInputHelper; import com.google.devtools.build.lib.actions.Artifact; import com.google.devtools.build.lib.actions.Artifact.ArtifactExpander; 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.vfs.PathFragment; import java.io.IOException; @@ -53,7 +53,7 @@ class WorkerFilesHash { * artifact of the given spawn. */ static SortedMap<PathFragment, HashCode> getWorkerFilesWithHashes( - Spawn spawn, ArtifactExpander artifactExpander, ActionInputFileCache actionInputFileCache) + Spawn spawn, ArtifactExpander artifactExpander, MetadataProvider actionInputFileCache) throws IOException { TreeMap<PathFragment, HashCode> workerFilesMap = new TreeMap<>(); diff --git a/src/main/java/com/google/devtools/build/lib/worker/WorkerSpawnRunner.java b/src/main/java/com/google/devtools/build/lib/worker/WorkerSpawnRunner.java index b9bbbe2896..4168a27ae0 100644 --- a/src/main/java/com/google/devtools/build/lib/worker/WorkerSpawnRunner.java +++ b/src/main/java/com/google/devtools/build/lib/worker/WorkerSpawnRunner.java @@ -25,10 +25,10 @@ import com.google.common.collect.Multimap; import com.google.common.hash.HashCode; import com.google.devtools.build.lib.actions.ActionExecutionMetadata; import com.google.devtools.build.lib.actions.ActionInput; -import com.google.devtools.build.lib.actions.ActionInputFileCache; import com.google.devtools.build.lib.actions.ActionInputHelper; import com.google.devtools.build.lib.actions.ExecException; import com.google.devtools.build.lib.actions.ExecutionRequirements; +import com.google.devtools.build.lib.actions.MetadataProvider; import com.google.devtools.build.lib.actions.ResourceManager; import com.google.devtools.build.lib.actions.ResourceManager.ResourceHandle; import com.google.devtools.build.lib.actions.Spawn; @@ -127,11 +127,11 @@ final class WorkerSpawnRunner implements SpawnRunner { ImmutableList<String> workerArgs = splitSpawnArgsIntoWorkerArgsAndFlagFiles(spawn, flagFiles); ImmutableMap<String, String> env = spawn.getEnvironment(); - ActionInputFileCache inputFileCache = context.getActionInputFileCache(); + MetadataProvider inputFileCache = context.getMetadataProvider(); SortedMap<PathFragment, HashCode> workerFiles = WorkerFilesHash.getWorkerFilesWithHashes( - spawn, context.getArtifactExpander(), context.getActionInputFileCache()); + spawn, context.getArtifactExpander(), context.getMetadataProvider()); HashCode workerFilesCombinedHash = WorkerFilesHash.getCombinedHash(workerFiles); @@ -199,7 +199,7 @@ final class WorkerSpawnRunner implements SpawnRunner { Spawn spawn, SpawnExecutionContext context, List<String> flagfiles, - ActionInputFileCache inputFileCache) + MetadataProvider inputFileCache) throws IOException { WorkRequest.Builder requestBuilder = WorkRequest.newBuilder(); for (String flagfile : flagfiles) { |