Clean up after https://github.com/bazelbuild/bazel/commit/2af3de3d5d1190c4daf26ee265006fe57f7358f3 as discussed on https://github.com/bazelbuild/bazel/pull/11799.
RELNOTES: None
PiperOrigin-RevId: 322174163
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 384ff69..6b794ba 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
@@ -158,7 +158,7 @@
spawnLogContext.logSpawn(
spawn,
actionExecutionContext.getMetadataProvider(),
- context.getInputMapping(true),
+ context.getInputMapping(),
context.getTimeout(),
spawnResult);
} catch (IOException e) {
@@ -221,7 +221,7 @@
if (Spawns.shouldPrefetchInputsForLocalExecution(spawn)) {
actionExecutionContext
.getActionInputPrefetcher()
- .prefetchFiles(getInputMapping(true).values(), getMetadataProvider());
+ .prefetchFiles(getInputMapping().values(), getMetadataProvider());
}
}
@@ -273,8 +273,7 @@
}
@Override
- public SortedMap<PathFragment, ActionInput> getInputMapping(
- boolean expandTreeArtifactsInRunfiles) throws IOException {
+ public SortedMap<PathFragment, ActionInput> getInputMapping() throws IOException {
if (lazyInputMapping == null) {
try (SilentCloseable c =
Profiler.instance().profile("AbstractSpawnStrategy.getInputMapping")) {
@@ -282,8 +281,7 @@
spawnInputExpander.getInputMapping(
spawn,
actionExecutionContext.getArtifactExpander(),
- actionExecutionContext.getMetadataProvider(),
- expandTreeArtifactsInRunfiles);
+ actionExecutionContext.getMetadataProvider());
}
}
return lazyInputMapping;
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 f339d6c..fe05f90 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
@@ -107,8 +107,7 @@
Map<PathFragment, ActionInput> inputMap,
RunfilesSupplier runfilesSupplier,
MetadataProvider actionFileCache,
- ArtifactExpander artifactExpander,
- boolean expandTreeArtifactsInRunfiles)
+ ArtifactExpander artifactExpander)
throws IOException {
Map<PathFragment, Map<PathFragment, Artifact>> rootsAndMappings =
runfilesSupplier.getMappings();
@@ -122,7 +121,7 @@
Artifact localArtifact = mapping.getValue();
if (localArtifact != null) {
Preconditions.checkState(!localArtifact.isMiddlemanArtifact());
- if (expandTreeArtifactsInRunfiles && localArtifact.isTreeArtifact()) {
+ if (localArtifact.isTreeArtifact()) {
List<ActionInput> expandedInputs =
ActionInputHelper.expandArtifacts(
NestedSetBuilder.create(Order.STABLE_ORDER, localArtifact), artifactExpander);
@@ -152,16 +151,10 @@
public Map<PathFragment, ActionInput> addRunfilesToInputs(
RunfilesSupplier runfilesSupplier,
MetadataProvider actionFileCache,
- ArtifactExpander artifactExpander,
- boolean expandTreeArtifactsInRunfiles)
+ ArtifactExpander artifactExpander)
throws IOException {
Map<PathFragment, ActionInput> inputMap = new HashMap<>();
- addRunfilesToInputs(
- inputMap,
- runfilesSupplier,
- actionFileCache,
- artifactExpander,
- expandTreeArtifactsInRunfiles);
+ addRunfilesToInputs(inputMap, runfilesSupplier, actionFileCache, artifactExpander);
return inputMap;
}
@@ -225,20 +218,13 @@
* <p>The returned map contains all runfiles, but not the {@code MANIFEST}.
*/
public SortedMap<PathFragment, ActionInput> getInputMapping(
- Spawn spawn,
- ArtifactExpander artifactExpander,
- MetadataProvider actionInputFileCache,
- boolean expandTreeArtifactsInRunfiles)
+ Spawn spawn, ArtifactExpander artifactExpander, MetadataProvider actionInputFileCache)
throws IOException {
TreeMap<PathFragment, ActionInput> inputMap = new TreeMap<>();
addInputs(inputMap, spawn, artifactExpander);
addRunfilesToInputs(
- inputMap,
- spawn.getRunfilesSupplier(),
- actionInputFileCache,
- artifactExpander,
- expandTreeArtifactsInRunfiles);
+ inputMap, spawn.getRunfilesSupplier(), actionInputFileCache, artifactExpander);
addFilesetManifests(spawn.getFilesetMappings(), inputMap);
return inputMap;
}
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 2403ba4..fc87860 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
@@ -198,8 +198,7 @@
/** The files to which to write stdout and stderr. */
FileOutErr getFileOutErr();
- SortedMap<PathFragment, ActionInput> getInputMapping(boolean expandTreeArtifactsInRunfiles)
- throws IOException;
+ SortedMap<PathFragment, ActionInput> getInputMapping() throws IOException;
/** Reports a progress update to the Spawn strategy. */
void report(ProgressStatus state, String name);
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 d0e5ad3..5ac4ddf 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
@@ -122,7 +122,7 @@
NetworkTime networkTime = new NetworkTime();
Stopwatch totalTime = Stopwatch.createStarted();
- SortedMap<PathFragment, ActionInput> inputMap = context.getInputMapping(true);
+ SortedMap<PathFragment, ActionInput> inputMap = context.getInputMapping();
MerkleTree merkleTree =
MerkleTree.build(inputMap, context.getMetadataProvider(), execRoot, digestUtil);
SpawnMetrics.Builder spawnMetrics =
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 3391b06..23e853a 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
@@ -209,7 +209,7 @@
context.report(ProgressStatus.EXECUTING, getName());
RemoteOutputsMode remoteOutputsMode = remoteOptions.remoteOutputsMode;
- SortedMap<PathFragment, ActionInput> inputMap = context.getInputMapping(true);
+ SortedMap<PathFragment, ActionInput> inputMap = context.getInputMapping();
final MerkleTree merkleTree =
MerkleTree.build(inputMap, context.getMetadataProvider(), execRoot, digestUtil);
SpawnMetrics.Builder spawnMetrics =
diff --git a/src/main/java/com/google/devtools/build/lib/sandbox/DarwinSandboxedSpawnRunner.java b/src/main/java/com/google/devtools/build/lib/sandbox/DarwinSandboxedSpawnRunner.java
index d02c9d8..c418eab 100644
--- a/src/main/java/com/google/devtools/build/lib/sandbox/DarwinSandboxedSpawnRunner.java
+++ b/src/main/java/com/google/devtools/build/lib/sandbox/DarwinSandboxedSpawnRunner.java
@@ -232,7 +232,7 @@
SandboxInputs inputs =
helpers.processInputFiles(
- context.getInputMapping(true), spawn, context.getArtifactExpander(), execRoot);
+ context.getInputMapping(), spawn, context.getArtifactExpander(), execRoot);
SandboxOutputs outputs = helpers.getOutputs(spawn);
final Path sandboxConfigPath = sandboxPath.getRelative("sandbox.sb");
diff --git a/src/main/java/com/google/devtools/build/lib/sandbox/DockerSandboxedSpawnRunner.java b/src/main/java/com/google/devtools/build/lib/sandbox/DockerSandboxedSpawnRunner.java
index 655f8d5..7b191ef 100644
--- a/src/main/java/com/google/devtools/build/lib/sandbox/DockerSandboxedSpawnRunner.java
+++ b/src/main/java/com/google/devtools/build/lib/sandbox/DockerSandboxedSpawnRunner.java
@@ -219,7 +219,7 @@
SandboxInputs inputs =
helpers.processInputFiles(
- context.getInputMapping(true), spawn, context.getArtifactExpander(), execRoot);
+ context.getInputMapping(), spawn, context.getArtifactExpander(), execRoot);
SandboxOutputs outputs = helpers.getOutputs(spawn);
Duration timeout = context.getTimeout();
diff --git a/src/main/java/com/google/devtools/build/lib/sandbox/LinuxSandboxedSpawnRunner.java b/src/main/java/com/google/devtools/build/lib/sandbox/LinuxSandboxedSpawnRunner.java
index 8dfbdcb..63d29c9 100644
--- a/src/main/java/com/google/devtools/build/lib/sandbox/LinuxSandboxedSpawnRunner.java
+++ b/src/main/java/com/google/devtools/build/lib/sandbox/LinuxSandboxedSpawnRunner.java
@@ -167,7 +167,7 @@
SandboxInputs inputs =
helpers.processInputFiles(
- context.getInputMapping(true), spawn, context.getArtifactExpander(), execRoot);
+ context.getInputMapping(), spawn, context.getArtifactExpander(), execRoot);
SandboxOutputs outputs = helpers.getOutputs(spawn);
Duration timeout = context.getTimeout();
diff --git a/src/main/java/com/google/devtools/build/lib/sandbox/ProcessWrapperSandboxedSpawnRunner.java b/src/main/java/com/google/devtools/build/lib/sandbox/ProcessWrapperSandboxedSpawnRunner.java
index e861173..35f6252 100644
--- a/src/main/java/com/google/devtools/build/lib/sandbox/ProcessWrapperSandboxedSpawnRunner.java
+++ b/src/main/java/com/google/devtools/build/lib/sandbox/ProcessWrapperSandboxedSpawnRunner.java
@@ -107,7 +107,7 @@
SandboxInputs inputs =
helpers.processInputFiles(
- context.getInputMapping(true), spawn, context.getArtifactExpander(), execRoot);
+ context.getInputMapping(), spawn, context.getArtifactExpander(), execRoot);
SandboxOutputs outputs = helpers.getOutputs(spawn);
if (sandboxfsProcess != null) {
diff --git a/src/main/java/com/google/devtools/build/lib/sandbox/WindowsSandboxedSpawnRunner.java b/src/main/java/com/google/devtools/build/lib/sandbox/WindowsSandboxedSpawnRunner.java
index 5a7fcb4..2c1b8d9 100644
--- a/src/main/java/com/google/devtools/build/lib/sandbox/WindowsSandboxedSpawnRunner.java
+++ b/src/main/java/com/google/devtools/build/lib/sandbox/WindowsSandboxedSpawnRunner.java
@@ -70,7 +70,7 @@
SandboxInputs readablePaths =
helpers.processInputFiles(
- context.getInputMapping(true), spawn, context.getArtifactExpander(), execRoot);
+ context.getInputMapping(), spawn, context.getArtifactExpander(), execRoot);
readablePaths.materializeVirtualInputs(execRoot);
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 de67165..357b041 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
@@ -190,7 +190,7 @@
SandboxInputs inputFiles =
helpers.processInputFiles(
- context.getInputMapping(true), spawn, context.getArtifactExpander(), execRoot);
+ context.getInputMapping(), spawn, context.getArtifactExpander(), execRoot);
SandboxOutputs outputs = helpers.getOutputs(spawn);
WorkerKey key =
diff --git a/src/test/java/com/google/devtools/build/lib/exec/SpawnInputExpanderTest.java b/src/test/java/com/google/devtools/build/lib/exec/SpawnInputExpanderTest.java
index 4172207..a94e211 100644
--- a/src/test/java/com/google/devtools/build/lib/exec/SpawnInputExpanderTest.java
+++ b/src/test/java/com/google/devtools/build/lib/exec/SpawnInputExpanderTest.java
@@ -74,7 +74,7 @@
public void testEmptyRunfiles() throws Exception {
RunfilesSupplier supplier = EmptyRunfilesSupplier.INSTANCE;
FakeActionInputFileCache mockCache = new FakeActionInputFileCache();
- expander.addRunfilesToInputs(inputMappings, supplier, mockCache, NO_ARTIFACT_EXPANDER, true);
+ expander.addRunfilesToInputs(inputMappings, supplier, mockCache, NO_ARTIFACT_EXPANDER);
assertThat(inputMappings).isEmpty();
}
@@ -92,7 +92,7 @@
FileArtifactValue.createForNormalFile(
FAKE_DIGEST, /*proxy=*/ null, 0L, /*isShareable=*/ true));
- expander.addRunfilesToInputs(inputMappings, supplier, mockCache, NO_ARTIFACT_EXPANDER, true);
+ expander.addRunfilesToInputs(inputMappings, supplier, mockCache, NO_ARTIFACT_EXPANDER);
assertThat(inputMappings).hasSize(1);
assertThat(inputMappings)
.containsEntry(PathFragment.create("runfiles/workspace/dir/file"), artifact);
@@ -126,7 +126,7 @@
}
};
- expander.addRunfilesToInputs(inputMappings, supplier, mockCache, filesetExpander, true);
+ expander.addRunfilesToInputs(inputMappings, supplier, mockCache, filesetExpander);
assertThat(inputMappings).hasSize(1);
assertThat(inputMappings)
.containsEntry(
@@ -150,11 +150,7 @@
IOException.class,
() ->
expander.addRunfilesToInputs(
- inputMappings,
- supplier,
- mockCache,
- NO_ARTIFACT_EXPANDER,
- true));
+ inputMappings, supplier, mockCache, NO_ARTIFACT_EXPANDER));
assertThat(expected).hasMessageThat().isEqualTo("Not a file: dir/file");
}
@@ -170,7 +166,7 @@
mockCache.put(artifact, FileArtifactValue.createForDirectoryWithMtime(-1));
expander = new SpawnInputExpander(execRoot, /*strict=*/ false);
- expander.addRunfilesToInputs(inputMappings, supplier, mockCache, NO_ARTIFACT_EXPANDER, true);
+ expander.addRunfilesToInputs(inputMappings, supplier, mockCache, NO_ARTIFACT_EXPANDER);
assertThat(inputMappings).hasSize(1);
assertThat(inputMappings)
.containsEntry(PathFragment.create("runfiles/workspace/dir/file"), artifact);
@@ -199,7 +195,7 @@
FileArtifactValue.createForNormalFile(
FAKE_DIGEST, /*proxy=*/ null, 12L, /*isShareable=*/ true));
- expander.addRunfilesToInputs(inputMappings, supplier, mockCache, NO_ARTIFACT_EXPANDER, true);
+ expander.addRunfilesToInputs(inputMappings, supplier, mockCache, NO_ARTIFACT_EXPANDER);
assertThat(inputMappings).hasSize(2);
assertThat(inputMappings)
.containsEntry(PathFragment.create("runfiles/workspace/dir/file"), artifact1);
@@ -224,7 +220,7 @@
FileArtifactValue.createForNormalFile(
FAKE_DIGEST, /*proxy=*/ null, 1L, /*isShareable=*/ true));
- expander.addRunfilesToInputs(inputMappings, supplier, mockCache, NO_ARTIFACT_EXPANDER, true);
+ expander.addRunfilesToInputs(inputMappings, supplier, mockCache, NO_ARTIFACT_EXPANDER);
assertThat(inputMappings).hasSize(1);
assertThat(inputMappings)
.containsEntry(PathFragment.create("runfiles/workspace/symlink"), artifact);
@@ -247,7 +243,7 @@
FileArtifactValue.createForNormalFile(
FAKE_DIGEST, /*proxy=*/ null, 1L, /*isShareable=*/ true));
- expander.addRunfilesToInputs(inputMappings, supplier, mockCache, NO_ARTIFACT_EXPANDER, true);
+ expander.addRunfilesToInputs(inputMappings, supplier, mockCache, NO_ARTIFACT_EXPANDER);
assertThat(inputMappings).hasSize(2);
assertThat(inputMappings).containsEntry(PathFragment.create("runfiles/symlink"), artifact);
// If there's no other entry, Runfiles adds an empty file in the workspace to make sure the
@@ -278,7 +274,7 @@
fakeCache.put(file1, FileArtifactValue.createForTesting(file1));
fakeCache.put(file2, FileArtifactValue.createForTesting(file2));
- expander.addRunfilesToInputs(inputMappings, supplier, fakeCache, artifactExpander, true);
+ expander.addRunfilesToInputs(inputMappings, supplier, fakeCache, artifactExpander);
assertThat(inputMappings).hasSize(2);
assertThat(inputMappings)
.containsEntry(PathFragment.create("runfiles/workspace/treeArtifact/file1"), file1);
@@ -310,7 +306,7 @@
fakeCache.put(file1, FileArtifactValue.createForTesting(file1));
fakeCache.put(file2, FileArtifactValue.createForTesting(file2));
- expander.addRunfilesToInputs(inputMappings, supplier, fakeCache, artifactExpander, true);
+ expander.addRunfilesToInputs(inputMappings, supplier, fakeCache, artifactExpander);
assertThat(inputMappings).hasSize(2);
assertThat(inputMappings)
.containsEntry(PathFragment.create("runfiles/workspace/symlink/file1"), file1);
@@ -338,7 +334,7 @@
fakeCache.put(file2, FileArtifactValue.createForTesting(file2));
Spawn spawn = new SpawnBuilder("/bin/echo", "Hello World").withInput(treeArtifact).build();
- inputMappings = expander.getInputMapping(spawn, artifactExpander, fakeCache, true);
+ inputMappings = expander.getInputMapping(spawn, artifactExpander, fakeCache);
assertThat(inputMappings).hasSize(2);
assertThat(inputMappings).containsEntry(PathFragment.create("out/treeArtifact/file1"), file1);
assertThat(inputMappings).containsEntry(PathFragment.create("out/treeArtifact/file2"), file2);
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 ca2bd3b..b14fad3 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
@@ -254,8 +254,7 @@
}
@Override
- public SortedMap<PathFragment, ActionInput> getInputMapping(
- boolean expandTreeArtifactsInRunfiles) {
+ public SortedMap<PathFragment, ActionInput> getInputMapping() {
return inputMapping;
}
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 b95c22e..bc3cc92 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
@@ -155,14 +155,9 @@
}
@Override
- public SortedMap<PathFragment, ActionInput> getInputMapping(
- boolean expandTreeArtifactsInRunfiles) throws IOException {
+ public SortedMap<PathFragment, ActionInput> getInputMapping() throws IOException {
return new SpawnInputExpander(execRoot, /*strict*/ false)
- .getInputMapping(
- simpleSpawn,
- SIMPLE_ARTIFACT_EXPANDER,
- fakeFileCache,
- true);
+ .getInputMapping(simpleSpawn, SIMPLE_ARTIFACT_EXPANDER, fakeFileCache);
}
@Override
diff --git a/src/test/java/com/google/devtools/build/lib/remote/util/FakeSpawnExecutionContext.java b/src/test/java/com/google/devtools/build/lib/remote/util/FakeSpawnExecutionContext.java
index f3d7991..f4610cf 100644
--- a/src/test/java/com/google/devtools/build/lib/remote/util/FakeSpawnExecutionContext.java
+++ b/src/test/java/com/google/devtools/build/lib/remote/util/FakeSpawnExecutionContext.java
@@ -112,10 +112,9 @@
}
@Override
- public SortedMap<PathFragment, ActionInput> getInputMapping(boolean expandTreeArtifactsInRunfiles)
- throws IOException {
+ public SortedMap<PathFragment, ActionInput> getInputMapping() throws IOException {
return new SpawnInputExpander(execRoot, /*strict*/ false)
- .getInputMapping(spawn, this::artifactExpander, metadataProvider, true);
+ .getInputMapping(spawn, this::artifactExpander, metadataProvider);
}
@Override
