Rename UnloadedToolchainContextKey to ToolchainContextKey.
Cleanup leading to toolchain transitions, #10523.
Closes #11336.
PiperOrigin-RevId: 311112930
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/BUILD b/src/test/java/com/google/devtools/build/lib/analysis/util/BUILD
index 8678905..d241ca4 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/util/BUILD
+++ b/src/test/java/com/google/devtools/build/lib/analysis/util/BUILD
@@ -104,9 +104,9 @@
"//src/main/java/com/google/devtools/build/lib/skyframe:sky_functions",
"//src/main/java/com/google/devtools/build/lib/skyframe:skyframe_cluster",
"//src/main/java/com/google/devtools/build/lib/skyframe:target_pattern_phase_value",
+ "//src/main/java/com/google/devtools/build/lib/skyframe:toolchain_context_key",
"//src/main/java/com/google/devtools/build/lib/skyframe:toolchain_exception",
"//src/main/java/com/google/devtools/build/lib/skyframe:unloaded_toolchain_context",
- "//src/main/java/com/google/devtools/build/lib/skyframe:unloaded_toolchain_context_key",
"//src/main/java/com/google/devtools/build/lib/skyframe/packages:PackageFactoryBuilderWithSkyframeForTesting",
"//src/main/java/com/google/devtools/build/lib/util",
"//src/main/java/com/google/devtools/build/lib/util:filetype",
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewForTesting.java b/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewForTesting.java
index 60c85e7..2badb26 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewForTesting.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewForTesting.java
@@ -84,9 +84,9 @@
import com.google.devtools.build.lib.skyframe.SkyframeBuildView;
import com.google.devtools.build.lib.skyframe.SkyframeExecutor;
import com.google.devtools.build.lib.skyframe.TargetPatternPhaseValue;
+import com.google.devtools.build.lib.skyframe.ToolchainContextKey;
import com.google.devtools.build.lib.skyframe.ToolchainException;
import com.google.devtools.build.lib.skyframe.UnloadedToolchainContext;
-import com.google.devtools.build.lib.skyframe.UnloadedToolchainContextKey;
import com.google.devtools.build.lib.syntax.EvalException;
import com.google.devtools.build.lib.util.OrderedSetMultimap;
import com.google.devtools.build.skyframe.SkyKey;
@@ -501,31 +501,31 @@
SkyFunctionEnvironmentForTesting skyfunctionEnvironment =
skyframeExecutor.getSkyFunctionEnvironmentForTesting(eventHandler);
- Map<String, UnloadedToolchainContextKey> unloadedToolchainContextKeys = new HashMap<>();
+ Map<String, ToolchainContextKey> toolchainContextKeys = new HashMap<>();
for (Map.Entry<String, ExecGroup> execGroup : execGroups.entrySet()) {
- unloadedToolchainContextKeys.put(
+ toolchainContextKeys.put(
execGroup.getKey(),
- UnloadedToolchainContextKey.key()
+ ToolchainContextKey.key()
.configurationKey(BuildConfigurationValue.key(targetConfig))
.requiredToolchainTypeLabels(execGroup.getValue().getRequiredToolchains())
.build());
}
String targetUnloadedToolchainContextKey = "target-unloaded-toolchain-context";
- unloadedToolchainContextKeys.put(
+ toolchainContextKeys.put(
targetUnloadedToolchainContextKey,
- UnloadedToolchainContextKey.key()
+ ToolchainContextKey.key()
.configurationKey(BuildConfigurationValue.key(targetConfig))
.requiredToolchainTypeLabels(requiredToolchains)
.build());
Map<SkyKey, ValueOrException<ToolchainException>> values =
skyfunctionEnvironment.getValuesOrThrow(
- unloadedToolchainContextKeys.values(), ToolchainException.class);
+ toolchainContextKeys.values(), ToolchainException.class);
ToolchainCollection.Builder<UnloadedToolchainContext> unloadedToolchainContexts =
new ToolchainCollection.Builder<>();
- for (Map.Entry<String, UnloadedToolchainContextKey> unloadedToolchainContextKey :
- unloadedToolchainContextKeys.entrySet()) {
+ for (Map.Entry<String, ToolchainContextKey> unloadedToolchainContextKey :
+ toolchainContextKeys.entrySet()) {
UnloadedToolchainContext unloadedToolchainContext =
(UnloadedToolchainContext) values.get(unloadedToolchainContextKey.getValue()).get();
String execGroup = unloadedToolchainContextKey.getKey();
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/BUILD b/src/test/java/com/google/devtools/build/lib/skyframe/BUILD
index d030cab..81d147e 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/BUILD
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/BUILD
@@ -225,7 +225,7 @@
"//src/main/java/com/google/devtools/build/lib/skyframe:transitive_traversal_value",
"//src/main/java/com/google/devtools/build/lib/skyframe:tree_artifact_value",
"//src/main/java/com/google/devtools/build/lib/skyframe:unloaded_toolchain_context",
- "//src/main/java/com/google/devtools/build/lib/skyframe:unloaded_toolchain_context_key",
+ "//src/main/java/com/google/devtools/build/lib/skyframe:toolchain_context_key",
"//src/main/java/com/google/devtools/build/lib/skyframe:workspace_ast_value",
"//src/main/java/com/google/devtools/build/lib/skyframe:workspace_name_value",
"//src/main/java/com/google/devtools/build/lib/skyframe/serialization",
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/ToolchainResolutionFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/ToolchainResolutionFunctionTest.java
index 02d8c04..4161f47 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/ToolchainResolutionFunctionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/ToolchainResolutionFunctionTest.java
@@ -66,8 +66,8 @@
"register_execution_platforms('//platforms:mac', '//platforms:linux')");
useConfiguration("--platforms=//platforms:linux");
- UnloadedToolchainContextKey key =
- UnloadedToolchainContextKey.key()
+ ToolchainContextKey key =
+ ToolchainContextKey.key()
.configurationKey(targetConfigKey)
.requiredToolchainTypeLabels(testToolchainTypeLabel)
.build();
@@ -110,8 +110,8 @@
"alias/BUILD", "alias(name = 'toolchain_type', actual = '//toolchain:test_toolchain')");
useConfiguration("--platforms=//platforms:linux");
- UnloadedToolchainContextKey key =
- UnloadedToolchainContextKey.key()
+ ToolchainContextKey key =
+ ToolchainContextKey.key()
.configurationKey(targetConfigKey)
.requiredToolchainTypeLabels(aliasedToolchainTypeLabel)
.build();
@@ -142,8 +142,7 @@
rewriteWorkspace("register_execution_platforms('//platforms:mac', '//platforms:linux')");
useConfiguration("--host_platform=//host:host", "--platforms=//platforms:linux");
- UnloadedToolchainContextKey key =
- UnloadedToolchainContextKey.key().configurationKey(targetConfigKey).build();
+ ToolchainContextKey key = ToolchainContextKey.key().configurationKey(targetConfigKey).build();
EvaluationResult<UnloadedToolchainContext> result = invokeToolchainResolution(key);
@@ -178,8 +177,8 @@
" '//sample:sample_a', '//sample:sample_b')");
useConfiguration("--host_platform=//host:host", "--platforms=//platforms:linux");
- UnloadedToolchainContextKey key =
- UnloadedToolchainContextKey.key()
+ ToolchainContextKey key =
+ ToolchainContextKey.key()
.configurationKey(targetConfigKey)
.execConstraintLabels(Label.parseAbsoluteUnchecked("//sample:demo_b"))
.build();
@@ -205,8 +204,8 @@
public void resolve_unavailableToolchainType_single() throws Exception {
scratch.file("fake/toolchain/BUILD", "");
useConfiguration("--host_platform=//platforms:linux", "--platforms=//platforms:mac");
- UnloadedToolchainContextKey key =
- UnloadedToolchainContextKey.key()
+ ToolchainContextKey key =
+ ToolchainContextKey.key()
.configurationKey(targetConfigKey)
.requiredToolchainTypeLabels(
testToolchainTypeLabel, Label.parseAbsoluteUnchecked("//fake/toolchain:type_1"))
@@ -229,8 +228,8 @@
public void resolve_unavailableToolchainType_multiple() throws Exception {
scratch.file("fake/toolchain/BUILD", "");
useConfiguration("--host_platform=//platforms:linux", "--platforms=//platforms:mac");
- UnloadedToolchainContextKey key =
- UnloadedToolchainContextKey.key()
+ ToolchainContextKey key =
+ ToolchainContextKey.key()
.configurationKey(targetConfigKey)
.requiredToolchainTypeLabels(
testToolchainTypeLabel,
@@ -251,8 +250,8 @@
public void resolve_invalidTargetPlatform_badTarget() throws Exception {
scratch.file("invalid/BUILD", "filegroup(name = 'not_a_platform')");
useConfiguration("--platforms=//invalid:not_a_platform");
- UnloadedToolchainContextKey key =
- UnloadedToolchainContextKey.key()
+ ToolchainContextKey key =
+ ToolchainContextKey.key()
.configurationKey(targetConfigKey)
.requiredToolchainTypeLabels(testToolchainTypeLabel)
.build();
@@ -277,8 +276,8 @@
public void resolve_invalidTargetPlatform_badPackage() throws Exception {
scratch.resolve("invalid").delete();
useConfiguration("--platforms=//invalid:not_a_platform");
- UnloadedToolchainContextKey key =
- UnloadedToolchainContextKey.key()
+ ToolchainContextKey key =
+ ToolchainContextKey.key()
.configurationKey(targetConfigKey)
.requiredToolchainTypeLabels(testToolchainTypeLabel)
.build();
@@ -301,8 +300,8 @@
public void resolve_invalidHostPlatform() throws Exception {
scratch.file("invalid/BUILD", "filegroup(name = 'not_a_platform')");
useConfiguration("--host_platform=//invalid:not_a_platform");
- UnloadedToolchainContextKey key =
- UnloadedToolchainContextKey.key()
+ ToolchainContextKey key =
+ ToolchainContextKey.key()
.configurationKey(targetConfigKey)
.requiredToolchainTypeLabels(testToolchainTypeLabel)
.build();
@@ -325,8 +324,8 @@
public void resolve_invalidExecutionPlatform() throws Exception {
scratch.file("invalid/BUILD", "filegroup(name = 'not_a_platform')");
useConfiguration("--extra_execution_platforms=//invalid:not_a_platform");
- UnloadedToolchainContextKey key =
- UnloadedToolchainContextKey.key()
+ ToolchainContextKey key =
+ ToolchainContextKey.key()
.configurationKey(targetConfigKey)
.requiredToolchainTypeLabels(testToolchainTypeLabel)
.build();
@@ -366,8 +365,8 @@
"register_execution_platforms('//platforms:mac', '//platforms:linux')");
useConfiguration("--platforms=//platforms:linux");
- UnloadedToolchainContextKey key =
- UnloadedToolchainContextKey.key()
+ ToolchainContextKey key =
+ ToolchainContextKey.key()
.configurationKey(targetConfigKey)
.requiredToolchainTypeLabels(testToolchainTypeLabel)
.execConstraintLabels(Label.parseAbsoluteUnchecked("//constraints:linux"))
@@ -395,8 +394,8 @@
@Test
public void resolve_execConstraints_invalid() throws Exception {
- UnloadedToolchainContextKey key =
- UnloadedToolchainContextKey.key()
+ ToolchainContextKey key =
+ ToolchainContextKey.key()
.configurationKey(targetConfigKey)
.requiredToolchainTypeLabels(testToolchainTypeLabel)
.execConstraintLabels(Label.parseAbsoluteUnchecked("//platforms:linux"))
@@ -447,8 +446,8 @@
"register_execution_platforms('//platforms:mac', '//platforms:linux')");
useConfiguration("--platforms=//platforms:linux");
- UnloadedToolchainContextKey key =
- UnloadedToolchainContextKey.key()
+ ToolchainContextKey key =
+ ToolchainContextKey.key()
.configurationKey(targetConfigKey)
.requiredToolchainTypeLabels(
Label.parseAbsoluteUnchecked("//a:toolchain_type_A"),
