diff options
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/analysis')
5 files changed, 36 insertions, 48 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/AspectResolver.java b/src/main/java/com/google/devtools/build/lib/analysis/AspectResolver.java index d5e1f00998..35eeae8959 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/AspectResolver.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/AspectResolver.java @@ -156,7 +156,7 @@ public final class AspectResolver { dependentAspects.build(), aspectDeps.getAspect(), dep.getAspectConfiguration(aspectDeps.getAspect())); - result.put(aspectKey.getAspectDescriptor(), aspectKey.getSkyKey()); + result.put(aspectKey.getAspectDescriptor(), aspectKey); return aspectKey; } diff --git a/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java b/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java index 660f69b413..4b58054fda 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java @@ -490,13 +490,15 @@ public class BuildView { eventBus.post(new TargetConfiguredEvent(target, byLabel.get(target.getLabel()))); } - List<ConfiguredTargetKey> topLevelCtKeys = Lists.transform(topLevelTargetsWithConfigs, - new Function<TargetAndConfiguration, ConfiguredTargetKey>() { - @Override - public ConfiguredTargetKey apply(TargetAndConfiguration node) { - return new ConfiguredTargetKey(node.getLabel(), node.getConfiguration()); - } - }); + List<ConfiguredTargetKey> topLevelCtKeys = + Lists.transform( + topLevelTargetsWithConfigs, + new Function<TargetAndConfiguration, ConfiguredTargetKey>() { + @Override + public ConfiguredTargetKey apply(TargetAndConfiguration node) { + return ConfiguredTargetKey.of(node.getLabel(), node.getConfiguration()); + } + }); Multimap<Pair<Label, String>, BuildConfiguration> aspectConfigurations = ArrayListMultimap.create(); @@ -646,13 +648,14 @@ public class BuildView { Iterables.addAll(artifactsToBuild, baselineCoverageArtifacts); if (coverageReportActionFactory != null) { CoverageReportActionsWrapper actionsWrapper; - actionsWrapper = coverageReportActionFactory.createCoverageReportActionsWrapper( - eventHandler, - directories, - allTargetsToTest, - baselineCoverageArtifacts, - getArtifactFactory(), - CoverageReportValue.ARTIFACT_OWNER); + actionsWrapper = + coverageReportActionFactory.createCoverageReportActionsWrapper( + eventHandler, + directories, + allTargetsToTest, + baselineCoverageArtifacts, + getArtifactFactory(), + CoverageReportValue.COVERAGE_REPORT_KEY); if (actionsWrapper != null) { ImmutableList<ActionAnalysisMetadata> actions = actionsWrapper.getActions(); skyframeExecutor.injectCoverageReportData(actions); @@ -673,7 +676,7 @@ public class BuildView { public ActionAnalysisMetadata getGeneratingAction(Artifact artifact) { ArtifactOwner artifactOwner = artifact.getArtifactOwner(); if (artifactOwner instanceof ActionLookupValue.ActionLookupKey) { - SkyKey key = ActionLookupValue.key((ActionLookupValue.ActionLookupKey) artifactOwner); + SkyKey key = (ActionLookupValue.ActionLookupKey) artifactOwner; ActionLookupValue val; try { val = (ActionLookupValue) graph.getValue(key); @@ -1081,7 +1084,7 @@ public class BuildView { new CachingAnalysisEnvironment( getArtifactFactory(), skyframeExecutor.getActionKeyContext(), - new ConfiguredTargetKey(target.getLabel(), targetConfig), + ConfiguredTargetKey.of(target.getLabel(), targetConfig), /*isSystemEnv=*/ false, targetConfig.extendedSanityChecks(), eventHandler, diff --git a/src/main/java/com/google/devtools/build/lib/analysis/CachingAnalysisEnvironment.java b/src/main/java/com/google/devtools/build/lib/analysis/CachingAnalysisEnvironment.java index 7d17950e2c..81d5d2e23f 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/CachingAnalysisEnvironment.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/CachingAnalysisEnvironment.java @@ -297,14 +297,14 @@ public class CachingAnalysisEnvironment implements AnalysisEnvironment { @Override public Artifact getStableWorkspaceStatusArtifact() throws InterruptedException { - return ((WorkspaceStatusValue) skyframeEnv.getValue(WorkspaceStatusValue.SKY_KEY)) - .getStableArtifact(); + return ((WorkspaceStatusValue) skyframeEnv.getValue(WorkspaceStatusValue.BUILD_INFO_KEY)) + .getStableArtifact(); } @Override public Artifact getVolatileWorkspaceStatusArtifact() throws InterruptedException { - return ((WorkspaceStatusValue) skyframeEnv.getValue(WorkspaceStatusValue.SKY_KEY)) - .getVolatileArtifact(); + return ((WorkspaceStatusValue) skyframeEnv.getValue(WorkspaceStatusValue.BUILD_INFO_KEY)) + .getVolatileArtifact(); } // See SkyframeBuildView#getWorkspaceStatusValues for the code that this method is attempting to @@ -327,8 +327,7 @@ public class CachingAnalysisEnvironment implements AnalysisEnvironment { throws InterruptedException { boolean stamp = AnalysisUtils.isStampingEnabled(ruleContext, config); BuildInfoCollectionValue collectionValue = - (BuildInfoCollectionValue) skyframeEnv.getValue(BuildInfoCollectionValue.key( - new BuildInfoCollectionValue.BuildInfoKeyAndConfig(key, config))); + (BuildInfoCollectionValue) skyframeEnv.getValue(BuildInfoCollectionValue.key(key, config)); if (collectionValue == null) { throw collectDebugInfoAndCrash(key, config); } diff --git a/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredTargetFactory.java b/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredTargetFactory.java index 25a33be726..913b6f1a71 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredTargetFactory.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredTargetFactory.java @@ -166,8 +166,10 @@ public final class ConfiguredTargetFactory { Root root = rule.hasBinaryOutput() ? configuration.getBinDirectory(rule.getRepository()) : configuration.getGenfilesDirectory(rule.getRepository()); - ArtifactOwner owner = new ConfiguredTargetKey(rule.getLabel(), - getArtifactOwnerConfiguration(analysisEnvironment.getSkyframeEnv(), configuration)); + ArtifactOwner owner = + ConfiguredTargetKey.of( + rule.getLabel(), + getArtifactOwnerConfiguration(analysisEnvironment.getSkyframeEnv(), configuration)); if (analysisEnvironment.getSkyframeEnv().valuesMissing()) { return null; } @@ -271,11 +273,13 @@ public final class ConfiguredTargetFactory { } } else if (target instanceof InputFile) { InputFile inputFile = (InputFile) target; - Artifact artifact = artifactFactory.getSourceArtifact( - inputFile.getExecPath(), - Root.asSourceRoot(inputFile.getPackage().getSourceRoot(), - inputFile.getPackage().getPackageIdentifier().getRepository().isMain()), - new ConfiguredTargetKey(target.getLabel(), config)); + Artifact artifact = + artifactFactory.getSourceArtifact( + inputFile.getExecPath(), + Root.asSourceRoot( + inputFile.getPackage().getSourceRoot(), + inputFile.getPackage().getPackageIdentifier().getRepository().isMain()), + ConfiguredTargetKey.of(target.getLabel(), config)); return new InputFileConfiguredTarget(targetContext, inputFile, artifact); } else if (target instanceof PackageGroup) { diff --git a/src/main/java/com/google/devtools/build/lib/analysis/TargetAndConfiguration.java b/src/main/java/com/google/devtools/build/lib/analysis/TargetAndConfiguration.java index e64098d39e..21ed49ed98 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/TargetAndConfiguration.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/TargetAndConfiguration.java @@ -13,13 +13,11 @@ // limitations under the License. package com.google.devtools.build.lib.analysis; -import com.google.common.base.Function; import com.google.common.base.Preconditions; import com.google.devtools.build.lib.analysis.config.BuildConfiguration; import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable; import com.google.devtools.build.lib.packages.Target; -import com.google.devtools.build.lib.skyframe.ConfiguredTargetKey; import java.util.Objects; import javax.annotation.Nullable; @@ -49,22 +47,6 @@ public final class TargetAndConfiguration { + (configuration == null ? "null" : configuration.checksum()); } - public static final Function<TargetAndConfiguration, String> NAME_FUNCTION = - new Function<TargetAndConfiguration, String>() { - @Override - public String apply(TargetAndConfiguration node) { - return node.getName(); - } - }; - - public static final Function<TargetAndConfiguration, ConfiguredTargetKey> - TO_LABEL_AND_CONFIGURATION = new Function<TargetAndConfiguration, ConfiguredTargetKey>() { - @Override - public ConfiguredTargetKey apply(TargetAndConfiguration input) { - return new ConfiguredTargetKey(input.getLabel(), input.getConfiguration()); - } - }; - @Override public boolean equals(Object that) { if (this == that) { |