From 499503bbfe192f109f05270e5391265c0cd0966f Mon Sep 17 00:00:00 2001 From: shahan Date: Thu, 7 Jun 2018 18:57:07 -0700 Subject: Deletes ActionInputFileCache. PiperOrigin-RevId: 199732415 --- .../devtools/build/lib/analysis/util/BuildViewTestCase.java | 8 ++++---- .../devtools/build/lib/exec/AbstractSpawnStrategyTest.java | 5 ++--- .../devtools/build/lib/exec/local/LocalSpawnRunnerTest.java | 6 +++--- .../devtools/build/lib/exec/util/FakeActionInputFileCache.java | 9 ++++----- .../devtools/build/lib/remote/FakeActionInputFileCache.java | 6 +++--- .../devtools/build/lib/remote/GrpcRemoteExecutionClientTest.java | 4 ++-- .../google/devtools/build/lib/remote/RemoteSpawnCacheTest.java | 4 ++-- .../google/devtools/build/lib/remote/RemoteSpawnRunnerTest.java | 4 ++-- .../google/devtools/build/lib/remote/TreeNodeRepositoryTest.java | 4 ++-- .../devtools/build/lib/skyframe/TimestampBuilderTestCase.java | 6 +++--- .../devtools/build/lib/skyframe/TreeArtifactBuildTest.java | 4 ++-- 11 files changed, 29 insertions(+), 31 deletions(-) (limited to 'src/test/java/com') 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 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 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 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(); -- cgit v1.2.3