diff options
30 files changed, 95 insertions, 111 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/actions/ActionExecutionContext.java b/src/main/java/com/google/devtools/build/lib/actions/ActionExecutionContext.java index b1bd6f6eca..1db7c23e43 100644 --- a/src/main/java/com/google/devtools/build/lib/actions/ActionExecutionContext.java +++ b/src/main/java/com/google/devtools/build/lib/actions/ActionExecutionContext.java @@ -44,7 +44,7 @@ import javax.annotation.Nullable; public class ActionExecutionContext implements Closeable { private final Executor executor; - private final ActionInputFileCache actionInputFileCache; + private final MetadataProvider actionInputFileCache; private final ActionInputPrefetcher actionInputPrefetcher; private final ActionKeyContext actionKeyContext; private final MetadataHandler metadataHandler; @@ -61,7 +61,7 @@ public class ActionExecutionContext implements Closeable { private ActionExecutionContext( Executor executor, - ActionInputFileCache actionInputFileCache, + MetadataProvider actionInputFileCache, ActionInputPrefetcher actionInputPrefetcher, ActionKeyContext actionKeyContext, MetadataHandler metadataHandler, @@ -86,7 +86,7 @@ public class ActionExecutionContext implements Closeable { public ActionExecutionContext( Executor executor, - ActionInputFileCache actionInputFileCache, + MetadataProvider actionInputFileCache, ActionInputPrefetcher actionInputPrefetcher, ActionKeyContext actionKeyContext, MetadataHandler metadataHandler, @@ -111,7 +111,7 @@ public class ActionExecutionContext implements Closeable { public static ActionExecutionContext forInputDiscovery( Executor executor, - ActionInputFileCache actionInputFileCache, + MetadataProvider actionInputFileCache, ActionInputPrefetcher actionInputPrefetcher, ActionKeyContext actionKeyContext, MetadataHandler metadataHandler, @@ -137,7 +137,7 @@ public class ActionExecutionContext implements Closeable { return actionInputPrefetcher; } - public ActionInputFileCache getActionInputFileCache() { + public MetadataProvider getMetadataProvider() { return actionInputFileCache; } diff --git a/src/main/java/com/google/devtools/build/lib/actions/ActionInputFileCache.java b/src/main/java/com/google/devtools/build/lib/actions/ActionInputFileCache.java deleted file mode 100644 index a166f4e6fa..0000000000 --- a/src/main/java/com/google/devtools/build/lib/actions/ActionInputFileCache.java +++ /dev/null @@ -1,17 +0,0 @@ -// Copyright 2014 The Bazel Authors. All rights reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -package com.google.devtools.build.lib.actions; - -/** A vestigial stub to be removed soon. */ -public interface ActionInputFileCache extends MetadataProvider {} diff --git a/src/main/java/com/google/devtools/build/lib/actions/DigestOfDirectoryException.java b/src/main/java/com/google/devtools/build/lib/actions/DigestOfDirectoryException.java index c0cf601adb..a218ac9739 100644 --- a/src/main/java/com/google/devtools/build/lib/actions/DigestOfDirectoryException.java +++ b/src/main/java/com/google/devtools/build/lib/actions/DigestOfDirectoryException.java @@ -16,10 +16,7 @@ package com.google.devtools.build.lib.actions; import java.io.IOException; -/** - * Exception thrown when we try to digest a directory in {@code ActionInputFileCache}. - * - */ +/** Exception thrown when we try to digest a directory in {@code MetadataProvider}. */ public class DigestOfDirectoryException extends IOException { public DigestOfDirectoryException(String message) { diff --git a/src/main/java/com/google/devtools/build/lib/buildtool/ExecutionTool.java b/src/main/java/com/google/devtools/build/lib/buildtool/ExecutionTool.java index 80a54f2673..f046110288 100644 --- a/src/main/java/com/google/devtools/build/lib/buildtool/ExecutionTool.java +++ b/src/main/java/com/google/devtools/build/lib/buildtool/ExecutionTool.java @@ -25,7 +25,6 @@ import com.google.common.collect.Iterables; import com.google.devtools.build.lib.actions.Action; import com.google.devtools.build.lib.actions.ActionCacheChecker; import com.google.devtools.build.lib.actions.ActionGraph; -import com.google.devtools.build.lib.actions.ActionInputFileCache; import com.google.devtools.build.lib.actions.ActionInputPrefetcher; import com.google.devtools.build.lib.actions.Artifact; import com.google.devtools.build.lib.actions.ArtifactFactory; @@ -34,6 +33,7 @@ import com.google.devtools.build.lib.actions.ExecException; import com.google.devtools.build.lib.actions.Executor; import com.google.devtools.build.lib.actions.ExecutorInitException; import com.google.devtools.build.lib.actions.LocalHostCapacity; +import com.google.devtools.build.lib.actions.MetadataProvider; import com.google.devtools.build.lib.actions.PackageRoots; import com.google.devtools.build.lib.actions.ResourceManager; import com.google.devtools.build.lib.actions.ResourceSet; @@ -117,7 +117,7 @@ public class ExecutionTool { private final BlazeRuntime runtime; private final BuildRequest request; private BlazeExecutor executor; - private final ActionInputFileCache fileCache; + private final MetadataProvider fileCache; private final ActionInputPrefetcher prefetcher; private final ImmutableList<ActionContextProvider> actionContextProviders; private SpawnActionContextMaps spawnActionContextMaps; diff --git a/src/main/java/com/google/devtools/build/lib/buildtool/SkyframeBuilder.java b/src/main/java/com/google/devtools/build/lib/buildtool/SkyframeBuilder.java index e4951bd8e9..797f3370b5 100644 --- a/src/main/java/com/google/devtools/build/lib/buildtool/SkyframeBuilder.java +++ b/src/main/java/com/google/devtools/build/lib/buildtool/SkyframeBuilder.java @@ -23,11 +23,11 @@ import com.google.common.collect.Sets; import com.google.devtools.build.lib.actions.ActionCacheChecker; import com.google.devtools.build.lib.actions.ActionExecutionException; import com.google.devtools.build.lib.actions.ActionExecutionStatusReporter; -import com.google.devtools.build.lib.actions.ActionInputFileCache; import com.google.devtools.build.lib.actions.ActionInputPrefetcher; import com.google.devtools.build.lib.actions.Artifact; import com.google.devtools.build.lib.actions.BuildFailedException; import com.google.devtools.build.lib.actions.Executor; +import com.google.devtools.build.lib.actions.MetadataProvider; import com.google.devtools.build.lib.actions.MissingInputFileException; import com.google.devtools.build.lib.actions.TestExecException; import com.google.devtools.build.lib.analysis.ConfiguredTarget; @@ -73,16 +73,22 @@ public class SkyframeBuilder implements Builder { private final int numJobs; private final boolean finalizeActionsToOutputService; private final ModifiedFileSet modifiedOutputFiles; - private final ActionInputFileCache fileCache; + private final MetadataProvider fileCache; private final ActionInputPrefetcher actionInputPrefetcher; private final ActionCacheChecker actionCacheChecker; private final int progressReportInterval; @VisibleForTesting - public SkyframeBuilder(SkyframeExecutor skyframeExecutor, ActionCacheChecker actionCacheChecker, - boolean keepGoing, int numJobs, ModifiedFileSet modifiedOutputFiles, - boolean finalizeActionsToOutputService, ActionInputFileCache fileCache, - ActionInputPrefetcher actionInputPrefetcher, int progressReportInterval) { + public SkyframeBuilder( + SkyframeExecutor skyframeExecutor, + ActionCacheChecker actionCacheChecker, + boolean keepGoing, + int numJobs, + ModifiedFileSet modifiedOutputFiles, + boolean finalizeActionsToOutputService, + MetadataProvider fileCache, + ActionInputPrefetcher actionInputPrefetcher, + int progressReportInterval) { this.skyframeExecutor = skyframeExecutor; this.actionCacheChecker = actionCacheChecker; this.keepGoing = keepGoing; diff --git a/src/main/java/com/google/devtools/build/lib/exec/AbstractSpawnStrategy.java b/src/main/java/com/google/devtools/build/lib/exec/AbstractSpawnStrategy.java index 6745b1a96e..c94cd491d5 100644 --- a/src/main/java/com/google/devtools/build/lib/exec/AbstractSpawnStrategy.java +++ b/src/main/java/com/google/devtools/build/lib/exec/AbstractSpawnStrategy.java @@ -20,11 +20,11 @@ import com.google.common.eventbus.EventBus; import com.google.devtools.build.lib.actions.ActionExecutionContext; 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.ActionStatusMessage; import com.google.devtools.build.lib.actions.Artifact.ArtifactExpander; import com.google.devtools.build.lib.actions.EnvironmentalExecException; import com.google.devtools.build.lib.actions.ExecException; +import com.google.devtools.build.lib.actions.MetadataProvider; import com.google.devtools.build.lib.actions.SandboxedSpawnActionContext; import com.google.devtools.build.lib.actions.Spawn; import com.google.devtools.build.lib.actions.SpawnActionContext; @@ -111,7 +111,7 @@ public abstract class AbstractSpawnStrategy implements SandboxedSpawnActionConte try { spawnLogContext.logSpawn( spawn, - actionExecutionContext.getActionInputFileCache(), + actionExecutionContext.getMetadataProvider(), context.getInputMapping(), context.getTimeout(), spawnResult); @@ -180,8 +180,8 @@ public abstract class AbstractSpawnStrategy implements SandboxedSpawnActionConte } @Override - public ActionInputFileCache getActionInputFileCache() { - return actionExecutionContext.getActionInputFileCache(); + public MetadataProvider getMetadataProvider() { + return actionExecutionContext.getMetadataProvider(); } @Override @@ -221,7 +221,7 @@ public abstract class AbstractSpawnStrategy implements SandboxedSpawnActionConte spawnInputExpander.getInputMapping( spawn, actionExecutionContext.getArtifactExpander(), - actionExecutionContext.getActionInputFileCache()); + actionExecutionContext.getMetadataProvider()); } return lazyInputMapping; } diff --git a/src/main/java/com/google/devtools/build/lib/exec/ActionContextProvider.java b/src/main/java/com/google/devtools/build/lib/exec/ActionContextProvider.java index f2f5e0f6fb..79ea2cdf49 100644 --- a/src/main/java/com/google/devtools/build/lib/exec/ActionContextProvider.java +++ b/src/main/java/com/google/devtools/build/lib/exec/ActionContextProvider.java @@ -15,9 +15,9 @@ package com.google.devtools.build.lib.exec; import com.google.devtools.build.lib.actions.ActionContext; import com.google.devtools.build.lib.actions.ActionGraph; -import com.google.devtools.build.lib.actions.ActionInputFileCache; import com.google.devtools.build.lib.actions.Artifact; import com.google.devtools.build.lib.actions.ExecutorInitException; +import com.google.devtools.build.lib.actions.MetadataProvider; /** * An object that provides execution strategies to {@link BlazeExecutor}. @@ -35,13 +35,12 @@ public abstract class ActionContextProvider { /** * Two-phase initialization. The input file cache usually comes from a different module than the - * {@link ActionContextProvider} instances that require it, so this method is called after - * {@link com.google.devtools.build.lib.runtime.BlazeModule#executorInit}. + * {@link ActionContextProvider} instances that require it, so this method is called after {@link + * com.google.devtools.build.lib.runtime.BlazeModule#executorInit}. * * @param actionInputFileCache the input file cache */ - public void init(ActionInputFileCache actionInputFileCache) { - } + public void init(MetadataProvider actionInputFileCache) {} /** * Called when the executor is constructed. The parameter contains all the contexts that were 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 10a816c886..683024e7a7 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 @@ -16,10 +16,10 @@ package com.google.devtools.build.lib.exec; import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; 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.FileArtifactValue; +import com.google.devtools.build.lib.actions.MetadataProvider; import com.google.devtools.build.lib.vfs.FileSystem; import com.google.devtools.build.lib.vfs.Path; import java.io.IOException; @@ -33,7 +33,7 @@ import javax.annotation.concurrent.ThreadSafe; * <p>Simply maintains a cached mapping from filename to metadata that may be populated only once. */ @ThreadSafe -public class SingleBuildFileCache implements ActionInputFileCache { +public class SingleBuildFileCache implements MetadataProvider { private final Path execRoot; public SingleBuildFileCache(String cwd, FileSystem fs) { diff --git a/src/main/java/com/google/devtools/build/lib/exec/SpawnInputExpander.java b/src/main/java/com/google/devtools/build/lib/exec/SpawnInputExpander.java index 0fa9c978ee..444ffa51b6 100644 --- a/src/main/java/com/google/devtools/build/lib/exec/SpawnInputExpander.java +++ b/src/main/java/com/google/devtools/build/lib/exec/SpawnInputExpander.java @@ -17,11 +17,11 @@ import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; 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.FilesetOutputSymlink; +import com.google.devtools.build.lib.actions.MetadataProvider; import com.google.devtools.build.lib.actions.RunfilesSupplier; import com.google.devtools.build.lib.actions.Spawn; import com.google.devtools.build.lib.actions.cache.VirtualActionInput.EmptyActionInput; @@ -103,7 +103,8 @@ public class SpawnInputExpander { void addRunfilesToInputs( Map<PathFragment, ActionInput> inputMap, RunfilesSupplier runfilesSupplier, - ActionInputFileCache actionFileCache) throws IOException { + MetadataProvider actionFileCache) + throws IOException { Map<PathFragment, Map<PathFragment, Artifact>> rootsAndMappings = null; rootsAndMappings = runfilesSupplier.getMappings(); @@ -180,7 +181,7 @@ public class SpawnInputExpander { * com.google.devtools.build.lib.actions.cache.VirtualActionInput}. */ public SortedMap<PathFragment, ActionInput> getInputMapping( - Spawn spawn, ArtifactExpander artifactExpander, ActionInputFileCache actionInputFileCache) + Spawn spawn, ArtifactExpander artifactExpander, MetadataProvider actionInputFileCache) throws IOException { TreeMap<PathFragment, ActionInput> inputMap = new TreeMap<>(); addInputs(inputMap, spawn, artifactExpander); diff --git a/src/main/java/com/google/devtools/build/lib/exec/SpawnRunner.java b/src/main/java/com/google/devtools/build/lib/exec/SpawnRunner.java index 5ed43cd14e..af391d5426 100644 --- a/src/main/java/com/google/devtools/build/lib/exec/SpawnRunner.java +++ b/src/main/java/com/google/devtools/build/lib/exec/SpawnRunner.java @@ -14,9 +14,9 @@ package com.google.devtools.build.lib.exec; import com.google.devtools.build.lib.actions.ActionInput; -import com.google.devtools.build.lib.actions.ActionInputFileCache; import com.google.devtools.build.lib.actions.Artifact.ArtifactExpander; import com.google.devtools.build.lib.actions.ExecException; +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.util.io.FileOutErr; @@ -159,7 +159,7 @@ public interface SpawnRunner { * The input file metadata cache for this specific spawn, which can be used to efficiently * obtain file digests and sizes. */ - ActionInputFileCache getActionInputFileCache(); + MetadataProvider getMetadataProvider(); /** An artifact expander. */ // TODO(ulfjack): This is only used for the sandbox runners to compute a set of empty diff --git a/src/main/java/com/google/devtools/build/lib/remote/RemoteSpawnCache.java b/src/main/java/com/google/devtools/build/lib/remote/RemoteSpawnCache.java index 837d53347e..a97d2778d5 100644 --- a/src/main/java/com/google/devtools/build/lib/remote/RemoteSpawnCache.java +++ b/src/main/java/com/google/devtools/build/lib/remote/RemoteSpawnCache.java @@ -95,7 +95,7 @@ final class RemoteSpawnCache implements SpawnCache { // Temporary hack: the TreeNodeRepository should be created and maintained upstream! TreeNodeRepository repository = - new TreeNodeRepository(execRoot, context.getActionInputFileCache(), digestUtil); + new TreeNodeRepository(execRoot, context.getMetadataProvider(), digestUtil); SortedMap<PathFragment, ActionInput> inputMap = context.getInputMapping(); TreeNode inputRoot = repository.buildFromActionInputs(inputMap); repository.computeMerkleDigests(inputRoot); @@ -204,7 +204,7 @@ final class RemoteSpawnCache implements SpawnCache { if (input instanceof VirtualActionInput) { continue; } - FileArtifactValue metadata = context.getActionInputFileCache().getMetadata(input); + FileArtifactValue metadata = context.getMetadataProvider().getMetadata(input); if (metadata instanceof FileArtifactValue) { FileArtifactValue artifactValue = (FileArtifactValue) metadata; Path path = execRoot.getRelative(input.getExecPath()); diff --git a/src/main/java/com/google/devtools/build/lib/remote/RemoteSpawnRunner.java b/src/main/java/com/google/devtools/build/lib/remote/RemoteSpawnRunner.java index f533cf7d16..5806b67660 100644 --- a/src/main/java/com/google/devtools/build/lib/remote/RemoteSpawnRunner.java +++ b/src/main/java/com/google/devtools/build/lib/remote/RemoteSpawnRunner.java @@ -21,10 +21,10 @@ import com.google.common.base.Throwables; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; 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.EnvironmentalExecException; import com.google.devtools.build.lib.actions.ExecException; +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.SpawnResult.Status; @@ -131,7 +131,7 @@ class RemoteSpawnRunner implements SpawnRunner { context.report(ProgressStatus.EXECUTING, getName()); // Temporary hack: the TreeNodeRepository should be created and maintained upstream! - ActionInputFileCache inputFileCache = context.getActionInputFileCache(); + MetadataProvider inputFileCache = context.getMetadataProvider(); TreeNodeRepository repository = new TreeNodeRepository(execRoot, inputFileCache, digestUtil); SortedMap<PathFragment, ActionInput> inputMap = context.getInputMapping(); TreeNode inputRoot = repository.buildFromActionInputs(inputMap); diff --git a/src/main/java/com/google/devtools/build/lib/rules/genrule/GenRuleAction.java b/src/main/java/com/google/devtools/build/lib/rules/genrule/GenRuleAction.java index 6f8e75fb65..e78072a043 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/genrule/GenRuleAction.java +++ b/src/main/java/com/google/devtools/build/lib/rules/genrule/GenRuleAction.java @@ -77,7 +77,7 @@ public class GenRuleAction extends SpawnAction { protected List<SpawnResult> internalExecute(ActionExecutionContext actionExecutionContext) throws ExecException, InterruptedException { EventHandler reporter = actionExecutionContext.getEventHandler(); - checkInputsForDirectories(reporter, actionExecutionContext.getActionInputFileCache()); + checkInputsForDirectories(reporter, actionExecutionContext.getMetadataProvider()); List<SpawnResult> spawnResults = ImmutableList.of(); try { spawnResults = super.internalExecute(actionExecutionContext); diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/ActionFileSystem.java b/src/main/java/com/google/devtools/build/lib/skyframe/ActionFileSystem.java index 591dd6c224..03b1896ea8 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/ActionFileSystem.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/ActionFileSystem.java @@ -22,12 +22,12 @@ import com.google.common.collect.Streams; import com.google.common.hash.Hashing; import com.google.common.io.BaseEncoding; import com.google.devtools.build.lib.actions.ActionInput; -import com.google.devtools.build.lib.actions.ActionInputFileCache; import com.google.devtools.build.lib.actions.ActionInputMap; import com.google.devtools.build.lib.actions.Artifact; import com.google.devtools.build.lib.actions.FileArtifactValue; import com.google.devtools.build.lib.actions.FileArtifactValue.RemoteFileArtifactValue; import com.google.devtools.build.lib.actions.FileStateType; +import com.google.devtools.build.lib.actions.MetadataProvider; import com.google.devtools.build.lib.profiler.Profiler; import com.google.devtools.build.lib.profiler.ProfilerTask; import com.google.devtools.build.lib.vfs.FileSystem; @@ -59,7 +59,7 @@ import javax.annotation.Nullable; * access {@link env}, they must also used synchronized access. * </ul> */ -final class ActionFileSystem extends FileSystem implements ActionInputFileCache, InjectionListener { +final class ActionFileSystem extends FileSystem implements MetadataProvider, InjectionListener { private static final Logger LOGGER = Logger.getLogger(ActionFileSystem.class.getName()); /** Actual underlying filesystem. */ @@ -151,7 +151,7 @@ final class ActionFileSystem extends FileSystem implements ActionInputFileCache, this.metadataConsumer = metadataConsumer; } - // -------------------- ActionInputFileCache implementation -------------------- + // -------------------- MetadataProvider implementation -------------------- @Override @Nullable diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/PerActionFileCache.java b/src/main/java/com/google/devtools/build/lib/skyframe/PerActionFileCache.java index b5660181e4..f27bd369a9 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/PerActionFileCache.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/PerActionFileCache.java @@ -15,10 +15,10 @@ package com.google.devtools.build.lib.skyframe; import com.google.common.base.Preconditions; import com.google.devtools.build.lib.actions.ActionInput; -import com.google.devtools.build.lib.actions.ActionInputFileCache; import com.google.devtools.build.lib.actions.ActionInputMap; import com.google.devtools.build.lib.actions.Artifact; import com.google.devtools.build.lib.actions.FileArtifactValue; +import com.google.devtools.build.lib.actions.MetadataProvider; import javax.annotation.Nullable; /** @@ -28,7 +28,7 @@ import javax.annotation.Nullable; * <p>Data for the action's inputs is injected into this cache on construction, using the graph as * the source of truth. */ -class PerActionFileCache implements ActionInputFileCache { +class PerActionFileCache implements MetadataProvider { private final ActionInputMap inputArtifactData; private final boolean missingArtifactsAllowed; diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeActionExecutor.java b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeActionExecutor.java index d0cb1433a6..acc97e046f 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeActionExecutor.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeActionExecutor.java @@ -36,7 +36,6 @@ import com.google.devtools.build.lib.actions.ActionExecutionException; import com.google.devtools.build.lib.actions.ActionExecutionStatusReporter; import com.google.devtools.build.lib.actions.ActionGraph; import com.google.devtools.build.lib.actions.ActionInput; -import com.google.devtools.build.lib.actions.ActionInputFileCache; import com.google.devtools.build.lib.actions.ActionInputPrefetcher; import com.google.devtools.build.lib.actions.ActionKeyContext; import com.google.devtools.build.lib.actions.ActionLogBufferPathGenerator; @@ -58,6 +57,7 @@ import com.google.devtools.build.lib.actions.Executor; import com.google.devtools.build.lib.actions.FileArtifactValue; import com.google.devtools.build.lib.actions.FilesetOutputSymlink; import com.google.devtools.build.lib.actions.MapBasedActionGraph; +import com.google.devtools.build.lib.actions.MetadataProvider; import com.google.devtools.build.lib.actions.MutableActionGraph; import com.google.devtools.build.lib.actions.MutableActionGraph.ActionConflictException; import com.google.devtools.build.lib.actions.NotifyOnActionCacheHit; @@ -150,7 +150,7 @@ public final class SkyframeActionExecutor { private ImmutableMap<ActionAnalysisMetadata, ConflictException> badActionMap = ImmutableMap.of(); private boolean keepGoing; private boolean hadExecutionError; - private ActionInputFileCache perBuildFileCache; + private MetadataProvider perBuildFileCache; private ActionInputPrefetcher actionInputPrefetcher; /** These variables are nulled out between executions. */ private ProgressSupplier progressSupplier; @@ -505,7 +505,7 @@ public final class SkyframeActionExecutor { * tasks related to that action. */ public ActionExecutionContext getContext( - ActionInputFileCache graphFileCache, + MetadataProvider graphFileCache, MetadataHandler metadataHandler, Map<Artifact, Collection<Artifact>> expandedInputs, ImmutableMap<PathFragment, ImmutableList<FilesetOutputSymlink>> inputFilesetMappings, @@ -657,8 +657,8 @@ public final class SkyframeActionExecutor { } } - private ActionInputFileCache createFileCache( - ActionInputFileCache graphFileCache, @Nullable ActionFileSystem actionFileSystem) { + private MetadataProvider createFileCache( + MetadataProvider graphFileCache, @Nullable ActionFileSystem actionFileSystem) { if (actionFileSystem != null) { return actionFileSystem; } @@ -688,7 +688,7 @@ public final class SkyframeActionExecutor { return hadExecutionError && !keepGoing; } - void configure(ActionInputFileCache fileCache, ActionInputPrefetcher actionInputPrefetcher) { + void configure(MetadataProvider fileCache, ActionInputPrefetcher actionInputPrefetcher) { this.perBuildFileCache = fileCache; this.actionInputPrefetcher = actionInputPrefetcher; } @@ -1255,12 +1255,12 @@ public final class SkyframeActionExecutor { this.completionReceiver = completionReceiver; } - private static class DelegatingPairFileCache implements ActionInputFileCache { - private final ActionInputFileCache perActionCache; - private final ActionInputFileCache perBuildFileCache; + private static class DelegatingPairFileCache implements MetadataProvider { + private final MetadataProvider perActionCache; + private final MetadataProvider perBuildFileCache; - private DelegatingPairFileCache(ActionInputFileCache mainCache, - ActionInputFileCache perBuildFileCache) { + private DelegatingPairFileCache( + MetadataProvider mainCache, MetadataProvider perBuildFileCache) { this.perActionCache = mainCache; this.perBuildFileCache = perBuildFileCache; } diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java index d52b9ed16e..46995551c6 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java @@ -39,7 +39,6 @@ import com.google.devtools.build.lib.actions.ActionAnalysisMetadata; import com.google.devtools.build.lib.actions.ActionCacheChecker; import com.google.devtools.build.lib.actions.ActionExecutionStatusReporter; import com.google.devtools.build.lib.actions.ActionGraph; -import com.google.devtools.build.lib.actions.ActionInputFileCache; import com.google.devtools.build.lib.actions.ActionInputPrefetcher; import com.google.devtools.build.lib.actions.ActionKeyContext; import com.google.devtools.build.lib.actions.ActionLogBufferPathGenerator; @@ -55,6 +54,7 @@ import com.google.devtools.build.lib.actions.Executor; import com.google.devtools.build.lib.actions.FileStateType; import com.google.devtools.build.lib.actions.FileStateValue; import com.google.devtools.build.lib.actions.FileValue; +import com.google.devtools.build.lib.actions.MetadataProvider; import com.google.devtools.build.lib.actions.ResourceManager; import com.google.devtools.build.lib.analysis.AnalysisProtos.ActionGraphContainer; import com.google.devtools.build.lib.analysis.AspectCollection; @@ -581,7 +581,7 @@ public abstract class SkyframeExecutor implements WalkableGraphFactory { } public void configureActionExecutor( - ActionInputFileCache fileCache, ActionInputPrefetcher actionInputPrefetcher) { + MetadataProvider fileCache, ActionInputPrefetcher actionInputPrefetcher) { this.skyframeActionExecutor.configure(fileCache, actionInputPrefetcher); } 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) { diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java b/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java index 360717f5fa..198d1a619e 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java @@ -33,7 +33,6 @@ import com.google.devtools.build.lib.actions.ActionAnalysisMetadata; import com.google.devtools.build.lib.actions.ActionExecutionContext; import com.google.devtools.build.lib.actions.ActionGraph; import com.google.devtools.build.lib.actions.ActionInput; -import com.google.devtools.build.lib.actions.ActionInputFileCache; import com.google.devtools.build.lib.actions.ActionKeyContext; import com.google.devtools.build.lib.actions.ActionLogBufferPathGenerator; import com.google.devtools.build.lib.actions.Artifact; @@ -47,6 +46,7 @@ import com.google.devtools.build.lib.actions.CommandLineExpansionException; import com.google.devtools.build.lib.actions.CommandLines; import com.google.devtools.build.lib.actions.CommandLines.CommandLineAndParamFileInfo; import com.google.devtools.build.lib.actions.MapBasedActionGraph; +import com.google.devtools.build.lib.actions.MetadataProvider; import com.google.devtools.build.lib.actions.MiddlemanFactory; import com.google.devtools.build.lib.actions.MutableActionGraph; import com.google.devtools.build.lib.actions.ParameterFile; @@ -2112,12 +2112,12 @@ public abstract class BuildViewTestCase extends FoundationTestCase { /** Creates instances of {@link ActionExecutionContext} consistent with test case. */ public class ActionExecutionContextBuilder { - private ActionInputFileCache actionInputFileCache = null; + private MetadataProvider actionInputFileCache = null; private TreeMap<String, String> clientEnv = new TreeMap<>(); private ArtifactExpander artifactExpander = null; - public ActionExecutionContextBuilder setActionInputFileCache( - ActionInputFileCache actionInputFileCache) { + public ActionExecutionContextBuilder setMetadataProvider( + MetadataProvider actionInputFileCache) { this.actionInputFileCache = actionInputFileCache; return this; } diff --git a/src/test/java/com/google/devtools/build/lib/exec/AbstractSpawnStrategyTest.java b/src/test/java/com/google/devtools/build/lib/exec/AbstractSpawnStrategyTest.java index 9b9f85e42c..d92a1b155e 100644 --- a/src/test/java/com/google/devtools/build/lib/exec/AbstractSpawnStrategyTest.java +++ b/src/test/java/com/google/devtools/build/lib/exec/AbstractSpawnStrategyTest.java @@ -23,9 +23,9 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import com.google.devtools.build.lib.actions.ActionExecutionContext; -import com.google.devtools.build.lib.actions.ActionInputFileCache; import com.google.devtools.build.lib.actions.Artifact; import com.google.devtools.build.lib.actions.ArtifactRoot; +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.SpawnResult.Status; @@ -207,8 +207,7 @@ public class AbstractSpawnStrategyTest { .setExitCode(23) .setRunnerName("runner") .build()); - when(actionExecutionContext.getActionInputFileCache()) - .thenReturn(mock(ActionInputFileCache.class)); + when(actionExecutionContext.getMetadataProvider()).thenReturn(mock(MetadataProvider.class)); Artifact input = new Artifact(scratch.file("/execroot/foo", "1"), rootDir); scratch.file("/execroot/out1", "123"); diff --git a/src/test/java/com/google/devtools/build/lib/exec/local/LocalSpawnRunnerTest.java b/src/test/java/com/google/devtools/build/lib/exec/local/LocalSpawnRunnerTest.java index 5763f91eac..f503ddb547 100644 --- a/src/test/java/com/google/devtools/build/lib/exec/local/LocalSpawnRunnerTest.java +++ b/src/test/java/com/google/devtools/build/lib/exec/local/LocalSpawnRunnerTest.java @@ -30,11 +30,11 @@ import com.google.common.collect.ImmutableList; import com.google.common.io.ByteStreams; import com.google.common.io.Files; import com.google.devtools.build.lib.actions.ActionInput; -import com.google.devtools.build.lib.actions.ActionInputFileCache; import com.google.devtools.build.lib.actions.Artifact.ArtifactExpander; import com.google.devtools.build.lib.actions.CommandLines.ParamFileActionInput; import com.google.devtools.build.lib.actions.ExecutionRequirements; import com.google.devtools.build.lib.actions.LocalHostCapacity; +import com.google.devtools.build.lib.actions.MetadataProvider; import com.google.devtools.build.lib.actions.ParameterFile.ParameterFileType; import com.google.devtools.build.lib.actions.ResourceManager; import com.google.devtools.build.lib.actions.ResourceSet; @@ -221,7 +221,7 @@ public class LocalSpawnRunnerTest { } @Override - public ActionInputFileCache getActionInputFileCache() { + public MetadataProvider getMetadataProvider() { return mockFileCache; } @@ -251,7 +251,7 @@ public class LocalSpawnRunnerTest { } } - private final ActionInputFileCache mockFileCache = mock(ActionInputFileCache.class); + private final MetadataProvider mockFileCache = mock(MetadataProvider.class); private final ResourceManager resourceManager = ResourceManager.instanceForTestingOnly(); private Logger logger; diff --git a/src/test/java/com/google/devtools/build/lib/exec/util/FakeActionInputFileCache.java b/src/test/java/com/google/devtools/build/lib/exec/util/FakeActionInputFileCache.java index 6eb2668981..f43d4237d2 100644 --- a/src/test/java/com/google/devtools/build/lib/exec/util/FakeActionInputFileCache.java +++ b/src/test/java/com/google/devtools/build/lib/exec/util/FakeActionInputFileCache.java @@ -15,18 +15,17 @@ package com.google.devtools.build.lib.exec.util; import com.google.common.base.Preconditions; import com.google.devtools.build.lib.actions.ActionInput; -import com.google.devtools.build.lib.actions.ActionInputFileCache; import com.google.devtools.build.lib.actions.FileArtifactValue; +import com.google.devtools.build.lib.actions.MetadataProvider; import java.io.IOException; import java.util.HashMap; import java.util.Map; -/** A fake implementation of the {@link ActionInputFileCache} interface. */ -public final class FakeActionInputFileCache implements ActionInputFileCache { +/** A fake implementation of the {@link MetadataProvider} interface. */ +public final class FakeActionInputFileCache implements MetadataProvider { private final Map<ActionInput, FileArtifactValue> inputs = new HashMap<>(); - public FakeActionInputFileCache() { - } + public FakeActionInputFileCache() {} public void put(ActionInput artifact, FileArtifactValue metadata) { inputs.put(artifact, metadata); diff --git a/src/test/java/com/google/devtools/build/lib/remote/FakeActionInputFileCache.java b/src/test/java/com/google/devtools/build/lib/remote/FakeActionInputFileCache.java index 729eeb2dbf..ccc0a4139f 100644 --- a/src/test/java/com/google/devtools/build/lib/remote/FakeActionInputFileCache.java +++ b/src/test/java/com/google/devtools/build/lib/remote/FakeActionInputFileCache.java @@ -18,9 +18,9 @@ import com.google.common.collect.BiMap; import com.google.common.collect.HashBiMap; import com.google.common.hash.HashCode; import com.google.devtools.build.lib.actions.ActionInput; -import com.google.devtools.build.lib.actions.ActionInputFileCache; import com.google.devtools.build.lib.actions.FileArtifactValue; import com.google.devtools.build.lib.actions.FileContentsProxy; +import com.google.devtools.build.lib.actions.MetadataProvider; import com.google.devtools.build.lib.remote.util.DigestUtil; import com.google.devtools.build.lib.vfs.FileStatus; import com.google.devtools.build.lib.vfs.FileSystemUtils; @@ -30,8 +30,8 @@ import com.google.devtools.remoteexecution.v1test.Digest; import com.google.devtools.remoteexecution.v1test.Tree; import java.io.IOException; -/** A fake implementation of the {@link ActionInputFileCache} interface. */ -final class FakeActionInputFileCache implements ActionInputFileCache { +/** A fake implementation of the {@link MetadataProvider} interface. */ +final class FakeActionInputFileCache implements MetadataProvider { private final Path execRoot; private final BiMap<ActionInput, String> cas = HashBiMap.create(); private final DigestUtil digestUtil; diff --git a/src/test/java/com/google/devtools/build/lib/remote/GrpcRemoteExecutionClientTest.java b/src/test/java/com/google/devtools/build/lib/remote/GrpcRemoteExecutionClientTest.java index e8b1313fd9..5bb5f6ab3c 100644 --- a/src/test/java/com/google/devtools/build/lib/remote/GrpcRemoteExecutionClientTest.java +++ b/src/test/java/com/google/devtools/build/lib/remote/GrpcRemoteExecutionClientTest.java @@ -29,11 +29,11 @@ import com.google.common.collect.ImmutableSet; import com.google.common.util.concurrent.ListeningScheduledExecutorService; import com.google.common.util.concurrent.MoreExecutors; 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.ExecException; +import com.google.devtools.build.lib.actions.MetadataProvider; import com.google.devtools.build.lib.actions.ResourceSet; import com.google.devtools.build.lib.actions.SimpleSpawn; import com.google.devtools.build.lib.actions.SpawnResult; @@ -157,7 +157,7 @@ public class GrpcRemoteExecutionClientTest { } @Override - public ActionInputFileCache getActionInputFileCache() { + public MetadataProvider getMetadataProvider() { return fakeFileCache; } diff --git a/src/test/java/com/google/devtools/build/lib/remote/RemoteSpawnCacheTest.java b/src/test/java/com/google/devtools/build/lib/remote/RemoteSpawnCacheTest.java index 7e0e028799..4273792319 100644 --- a/src/test/java/com/google/devtools/build/lib/remote/RemoteSpawnCacheTest.java +++ b/src/test/java/com/google/devtools/build/lib/remote/RemoteSpawnCacheTest.java @@ -25,11 +25,11 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.eventbus.EventBus; 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.ExecutionRequirements; +import com.google.devtools.build.lib.actions.MetadataProvider; import com.google.devtools.build.lib.actions.ResourceSet; import com.google.devtools.build.lib.actions.SimpleSpawn; import com.google.devtools.build.lib.actions.SpawnResult; @@ -123,7 +123,7 @@ public class RemoteSpawnCacheTest { } @Override - public ActionInputFileCache getActionInputFileCache() { + public MetadataProvider getMetadataProvider() { return fakeFileCache; } diff --git a/src/test/java/com/google/devtools/build/lib/remote/RemoteSpawnRunnerTest.java b/src/test/java/com/google/devtools/build/lib/remote/RemoteSpawnRunnerTest.java index b325eebe1d..0b6e052c00 100644 --- a/src/test/java/com/google/devtools/build/lib/remote/RemoteSpawnRunnerTest.java +++ b/src/test/java/com/google/devtools/build/lib/remote/RemoteSpawnRunnerTest.java @@ -30,10 +30,10 @@ import com.google.common.collect.ImmutableMap; import com.google.common.eventbus.EventBus; import com.google.common.util.concurrent.SettableFuture; import com.google.devtools.build.lib.actions.ActionInput; -import com.google.devtools.build.lib.actions.ActionInputFileCache; import com.google.devtools.build.lib.actions.Artifact.ArtifactExpander; import com.google.devtools.build.lib.actions.EnvironmentalExecException; import com.google.devtools.build.lib.actions.ExecutionRequirements; +import com.google.devtools.build.lib.actions.MetadataProvider; import com.google.devtools.build.lib.actions.ResourceSet; import com.google.devtools.build.lib.actions.SimpleSpawn; import com.google.devtools.build.lib.actions.Spawn; @@ -949,7 +949,7 @@ public class RemoteSpawnRunnerTest { } @Override - public ActionInputFileCache getActionInputFileCache() { + public MetadataProvider getMetadataProvider() { return fakeFileCache; } diff --git a/src/test/java/com/google/devtools/build/lib/remote/TreeNodeRepositoryTest.java b/src/test/java/com/google/devtools/build/lib/remote/TreeNodeRepositoryTest.java index 4fa0382466..0effbf86a6 100644 --- a/src/test/java/com/google/devtools/build/lib/remote/TreeNodeRepositoryTest.java +++ b/src/test/java/com/google/devtools/build/lib/remote/TreeNodeRepositoryTest.java @@ -17,10 +17,10 @@ import static com.google.common.truth.Truth.assertThat; import com.google.common.collect.ImmutableCollection; 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.ArtifactRoot; +import com.google.devtools.build.lib.actions.MetadataProvider; import com.google.devtools.build.lib.clock.BlazeClock; import com.google.devtools.build.lib.exec.SingleBuildFileCache; import com.google.devtools.build.lib.remote.TreeNodeRepository.TreeNode; @@ -59,7 +59,7 @@ public class TreeNodeRepositoryTest { } private TreeNodeRepository createTestTreeNodeRepository() { - ActionInputFileCache inputFileCache = + MetadataProvider inputFileCache = new SingleBuildFileCache(execRoot.getPathString(), scratch.getFileSystem()); return new TreeNodeRepository(execRoot, inputFileCache, digestUtil); } diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/TimestampBuilderTestCase.java b/src/test/java/com/google/devtools/build/lib/skyframe/TimestampBuilderTestCase.java index 2b16cdfb1c..52fc550a4c 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/TimestampBuilderTestCase.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/TimestampBuilderTestCase.java @@ -31,7 +31,6 @@ import com.google.devtools.build.lib.actions.ActionCacheChecker; import com.google.devtools.build.lib.actions.ActionExecutionContext; import com.google.devtools.build.lib.actions.ActionExecutionException; import com.google.devtools.build.lib.actions.ActionExecutionStatusReporter; -import com.google.devtools.build.lib.actions.ActionInputFileCache; import com.google.devtools.build.lib.actions.ActionInputPrefetcher; import com.google.devtools.build.lib.actions.ActionKeyContext; import com.google.devtools.build.lib.actions.ActionLogBufferPathGenerator; @@ -46,6 +45,7 @@ import com.google.devtools.build.lib.actions.BuildFailedException; import com.google.devtools.build.lib.actions.Executor; import com.google.devtools.build.lib.actions.FileStateValue; import com.google.devtools.build.lib.actions.FileValue; +import com.google.devtools.build.lib.actions.MetadataProvider; import com.google.devtools.build.lib.actions.MutableActionGraph.ActionConflictException; import com.google.devtools.build.lib.actions.ResourceManager; import com.google.devtools.build.lib.actions.ResourceSet; @@ -198,8 +198,8 @@ public abstract class TimestampBuilderTestCase extends FoundationTestCase { skyframeActionExecutor.setActionLogBufferPathGenerator( new ActionLogBufferPathGenerator(actionOutputBase)); - ActionInputFileCache cache = new SingleBuildFileCache( - rootDirectory.getPathString(), scratch.getFileSystem()); + MetadataProvider cache = + new SingleBuildFileCache(rootDirectory.getPathString(), scratch.getFileSystem()); skyframeActionExecutor.configure(cache, ActionInputPrefetcher.NONE); final InMemoryMemoizingEvaluator evaluator = diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/TreeArtifactBuildTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/TreeArtifactBuildTest.java index 2905030675..5aae72843a 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/TreeArtifactBuildTest.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/TreeArtifactBuildTest.java @@ -30,7 +30,6 @@ import com.google.devtools.build.lib.actions.Action; import com.google.devtools.build.lib.actions.ActionExecutionContext; import com.google.devtools.build.lib.actions.ActionExecutionException; 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.ActionKeyContext; import com.google.devtools.build.lib.actions.ActionResult; @@ -41,6 +40,7 @@ import com.google.devtools.build.lib.actions.Artifact.SpecialArtifactType; import com.google.devtools.build.lib.actions.Artifact.TreeFileArtifact; import com.google.devtools.build.lib.actions.ArtifactRoot; import com.google.devtools.build.lib.actions.BuildFailedException; +import com.google.devtools.build.lib.actions.MetadataProvider; import com.google.devtools.build.lib.actions.MutableActionGraph.ActionConflictException; import com.google.devtools.build.lib.actions.OutputBaseSupplier; import com.google.devtools.build.lib.actions.cache.MetadataHandler; @@ -166,7 +166,7 @@ public class TreeArtifactBuildTest extends TimestampBuilderTestCase { public ActionResult execute(ActionExecutionContext actionExecutionContext) { try { // Check the file cache for input TreeFileArtifacts. - ActionInputFileCache fileCache = actionExecutionContext.getActionInputFileCache(); + MetadataProvider fileCache = actionExecutionContext.getMetadataProvider(); assertThat(fileCache.getMetadata(outOneFileOne).getType().isFile()).isTrue(); assertThat(fileCache.getMetadata(outOneFileTwo).getType().isFile()).isTrue(); |