Skip to content

Commit

Permalink
Rename UnloadedToolchainContextKey to ToolchainContextKey.
Browse files Browse the repository at this point in the history 
Cleanup leading to toolchain transitions, #10523.

Closes #11336.

PiperOrigin-RevId: 311112930
  • Loading branch information
@katre
katre authored and Copybara-Service committed May 12, 2020
1 parent 79a201b commit 6083711
Show file tree
Hide file tree
Showing 12 changed files with 70 additions and 71 deletions.
2 changes: 1 addition & 1 deletion src/main/java/com/google/devtools/build/lib/query2/BUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,10 +81,10 @@ java_library(
"//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_value",
"//src/main/java/com/google/devtools/build/lib/skyframe:toolchain_context_key",
"//src/main/java/com/google/devtools/build/lib/skyframe:transitive_traversal_value",
"//src/main/java/com/google/devtools/build/lib/skyframe:traversal_info_root_package_extractor",
"//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:workspace_name_value",
"//src/main/java/com/google/devtools/build/lib/supplier",
"//src/main/java/com/google/devtools/build/lib/util",
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/com/google/devtools/build/lib/query2/cquery/ConfiguredTargetAccessor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@
import com.google.devtools.build.lib.skyframe.ConfiguredTargetKey;
import com.google.devtools.build.lib.skyframe.ConfiguredTargetValue;
import com.google.devtools.build.lib.skyframe.PackageValue;
import com.google.devtools.build.lib.skyframe.ToolchainContextKey;
import com.google.devtools.build.lib.skyframe.UnloadedToolchainContext;
import com.google.devtools.build.lib.skyframe.UnloadedToolchainContextKey;
import com.google.devtools.build.skyframe.WalkableGraph;
import java.util.List;
import java.util.Map;
Expand Down Expand Up @@ -229,7 +229,7 @@ private static ToolchainCollection<ToolchainContext> getToolchainContexts(
UnloadedToolchainContext context =
(UnloadedToolchainContext)
walkableGraph.getValue(
UnloadedToolchainContextKey.key()
ToolchainContextKey.key()
.configurationKey(BuildConfigurationValue.key(config))
.requiredToolchainTypeLabels(execGroup.getRequiredToolchains())
.execConstraintLabels(execGroup.getExecutionPlatformConstraints())
Expand All @@ -242,7 +242,7 @@ private static ToolchainCollection<ToolchainContext> getToolchainContexts(
UnloadedToolchainContext defaultContext =
(UnloadedToolchainContext)
walkableGraph.getValue(
UnloadedToolchainContextKey.key()
ToolchainContextKey.key()
.configurationKey(BuildConfigurationValue.key(config))
.requiredToolchainTypeLabels(requiredToolchains)
.execConstraintLabels(execConstraintLabels)
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/google/devtools/build/lib/skyframe/AspectFunction.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -394,7 +394,7 @@ public SkyValue compute(SkyKey skyKey, Environment env)
unloadedToolchainContext =
(UnloadedToolchainContext)
env.getValueOrThrow(
UnloadedToolchainContextKey.key()
ToolchainContextKey.key()
.configurationKey(BuildConfigurationValue.key(configuration))
.requiredToolchainTypeLabels(requiredToolchains)
.shouldSanityCheckConfiguration(
Expand Down
28 changes: 14 additions & 14 deletions src/main/java/com/google/devtools/build/lib/skyframe/BUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,7 @@ java_library(
":test_expansion_function",
":tests_for_target_pattern_function",
":tests_for_target_pattern_value",
":toolchain_context_key",
":toolchain_exception",
":top_down_action_cache",
":transitive_base_traversal_function",
Expand All @@ -217,7 +218,6 @@ java_library(
":transitive_traversal_value",
":tree_artifact_value",
":unloaded_toolchain_context",
":unloaded_toolchain_context_key",
":workspace_ast_value",
":workspace_name_function",
":workspace_name_value",
Expand Down Expand Up @@ -2478,6 +2478,19 @@ java_library(
],
)

java_library(
name = "toolchain_context_key",
srcs = ["ToolchainContextKey.java"],
deps = [
":build_configuration_value",
":sky_functions",
"//src/main/java/com/google/devtools/build/lib/cmdline",
"//src/main/java/com/google/devtools/build/skyframe:skyframe-objects",
"//third_party:auto_value",
"//third_party:guava",
],
)

java_library(
name = "toolchain_exception",
srcs = ["ToolchainException.java"],
Expand Down Expand Up @@ -2637,19 +2650,6 @@ java_library(
],
)

java_library(
name = "unloaded_toolchain_context_key",
srcs = ["UnloadedToolchainContextKey.java"],
deps = [
":build_configuration_value",
":sky_functions",
"//src/main/java/com/google/devtools/build/lib/cmdline",
"//src/main/java/com/google/devtools/build/skyframe:skyframe-objects",
"//third_party:auto_value",
"//third_party:guava",
],
)

java_library(
name = "workspace_ast_value",
srcs = ["WorkspaceASTValue.java"],
Expand Down
16 changes: 8 additions & 8 deletions src/main/java/com/google/devtools/build/lib/skyframe/ConfiguredTargetFunction.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -484,21 +484,21 @@ private ToolchainCollection<UnloadedToolchainContext> computeUnloadedToolchainCo
configuration.getFragmentsMap().keySet(),
BuildOptions.diffForReconstruction(defaultBuildOptions, toolchainOptions));

Map<String, UnloadedToolchainContextKey> unloadedToolchainContextKeys = new HashMap<>();
Map<String, ToolchainContextKey> toolchainContextKeys = new HashMap<>();
String targetUnloadedToolchainContext = "target-unloaded-toolchain-context";
unloadedToolchainContextKeys.put(
toolchainContextKeys.put(
targetUnloadedToolchainContext,
UnloadedToolchainContextKey.key()
ToolchainContextKey.key()
.configurationKey(toolchainConfig)
.requiredToolchainTypeLabels(requiredDefaultToolchains)
.execConstraintLabels(defaultExecConstraintLabels)
.shouldSanityCheckConfiguration(configuration.trimConfigurationsRetroactively())
.build());
for (Map.Entry<String, ExecGroup> group : execGroups.entrySet()) {
ExecGroup execGroup = group.getValue();
unloadedToolchainContextKeys.put(
toolchainContextKeys.put(
group.getKey(),
UnloadedToolchainContextKey.key()
ToolchainContextKey.key()
.configurationKey(toolchainConfig)
.requiredToolchainTypeLabels(execGroup.getRequiredToolchains())
.execConstraintLabels(execGroup.getExecutionPlatformConstraints())
Expand All @@ -507,14 +507,14 @@ private ToolchainCollection<UnloadedToolchainContext> computeUnloadedToolchainCo
}

Map<SkyKey, ValueOrException<ToolchainException>> values =
env.getValuesOrThrow(unloadedToolchainContextKeys.values(), ToolchainException.class);
env.getValuesOrThrow(toolchainContextKeys.values(), ToolchainException.class);

boolean valuesMissing = env.valuesMissing();

ToolchainCollection.Builder<UnloadedToolchainContext> toolchainContexts =
valuesMissing ? null : 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();
if (!valuesMissing) {
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/google/devtools/build/lib/skyframe/RegisteredToolchainsCycleReporter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,9 +88,9 @@ public boolean maybeReportCycle(
((SingleToolchainResolutionKey) input.argument()).toolchainTypeLabel();
return String.format("toolchain type %s", toolchainType);
}
if (input.argument() instanceof UnloadedToolchainContextKey) {
if (input.argument() instanceof ToolchainContextKey) {
ImmutableSet<Label> toolchainTypes =
((UnloadedToolchainContextKey) input.argument()).requiredToolchainTypeLabels();
((ToolchainContextKey) input.argument()).requiredToolchainTypeLabels();
return String.format(
"toolchain types %s",
toolchainTypes.stream().map(Label::toString).collect(joining(", ")));
Expand Down
8 changes: 4 additions & 4 deletions ...skyframe/UnloadedToolchainContextKey.java → ...ild/lib/skyframe/ToolchainContextKey.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@
* UnloadedToolchainContextImpl} instances.
*/
@AutoValue
public abstract class UnloadedToolchainContextKey implements SkyKey {
public abstract class ToolchainContextKey implements SkyKey {

/** Returns a new {@link Builder}. */
public static Builder key() {
return new AutoValue_UnloadedToolchainContextKey.Builder()
return new AutoValue_ToolchainContextKey.Builder()
.requiredToolchainTypeLabels(ImmutableSet.of())
.execConstraintLabels(ImmutableSet.of())
.shouldSanityCheckConfiguration(false);
Expand All @@ -47,7 +47,7 @@ public SkyFunctionName functionName() {

abstract boolean shouldSanityCheckConfiguration();

/** Builder for {@link UnloadedToolchainContextKey}. */
/** Builder for {@link ToolchainContextKey}. */
@AutoValue.Builder
public interface Builder {
Builder configurationKey(BuildConfigurationValue.Key key);
Expand All @@ -62,6 +62,6 @@ public interface Builder {

Builder shouldSanityCheckConfiguration(boolean shouldSanityCheckConfiguration);

UnloadedToolchainContextKey build();
ToolchainContextKey build();
}
}
2 changes: 1 addition & 1 deletion src/main/java/com/google/devtools/build/lib/skyframe/ToolchainResolutionFunction.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ public class ToolchainResolutionFunction implements SkyFunction {
@Override
public UnloadedToolchainContext compute(SkyKey skyKey, Environment env)
throws ToolchainResolutionFunctionException, InterruptedException {
UnloadedToolchainContextKey key = (UnloadedToolchainContextKey) skyKey.argument();
ToolchainContextKey key = (ToolchainContextKey) skyKey.argument();

try {
UnloadedToolchainContextImpl.Builder builder = UnloadedToolchainContextImpl.builder();
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/com/google/devtools/build/lib/analysis/util/BUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,9 +104,9 @@ java_library(
"//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",
Expand Down
18 changes: 9 additions & 9 deletions src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewForTesting.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -501,31 +501,31 @@ public RuleContext getRuleContextForTesting(
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();
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/com/google/devtools/build/lib/skyframe/BUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ java_test(
"//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",
Expand Down
Loading

0 comments on commit 6083711

Please sign in to comment.