diff options
| author |  janakr <janakr@google.com> | 2018-03-10 06:48:59 -0800 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-03-10 06:50:28 -0800 |
| commit | 9c101404519d91db8e8dec09f9a9495eb8352f58 (patch) | |
| tree | d2689acedd5ce2474ea89089aa8651be00c6a485 /src/test/java/com/google/devtools/build/lib/skyframe | |
| parent | 50f99d56bb710f01524bd3f04882dada16a792c3 (diff) | |
Add BuildConfiguration to ConfiguredTargetAndTarget and rename it to ConfiguredTargetAndData. We want to get BuildConfiguration out of ConfiguredTarget because it uses >800K when serialized.
PiperOrigin-RevId: 188600002
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/skyframe')
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/skyframe/ConfigurationsForTargetsTest.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/ConfigurationsForTargetsTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/ConfigurationsForTargetsTest.java index bc0d3ec083..f1f4b367a1 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/ConfigurationsForTargetsTest.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/ConfigurationsForTargetsTest.java @@ -119,9 +119,9 @@ public class ConfigurationsForTargetsTest extends AnalysisTestCase { * deps of given target. */ static class Value implements SkyValue { - OrderedSetMultimap<Attribute, ConfiguredTargetAndTarget> depMap; + OrderedSetMultimap<Attribute, ConfiguredTargetAndData> depMap; - Value(OrderedSetMultimap<Attribute, ConfiguredTargetAndTarget> depMap) { + Value(OrderedSetMultimap<Attribute, ConfiguredTargetAndData> depMap) { this.depMap = depMap; } } @@ -130,7 +130,7 @@ public class ConfigurationsForTargetsTest extends AnalysisTestCase { public SkyValue compute(SkyKey skyKey, Environment env) throws EvalException, InterruptedException { try { - OrderedSetMultimap<Attribute, ConfiguredTargetAndTarget> depMap = + OrderedSetMultimap<Attribute, ConfiguredTargetAndData> depMap = ConfiguredTargetFunction.computeDependencies( env, new SkyframeDependencyResolver(env), @@ -209,7 +209,7 @@ public class ConfigurationsForTargetsTest extends AnalysisTestCase { * Returns the configured deps for a given target, assuming the target uses the target * configuration. */ - private Multimap<Attribute, ConfiguredTargetAndTarget> getConfiguredDeps(String targetLabel) + private Multimap<Attribute, ConfiguredTargetAndData> getConfiguredDeps(String targetLabel) throws Exception { update(targetLabel); SkyKey key = ComputeDependenciesFunction.key(getTarget(targetLabel), getTargetConfiguration()); @@ -230,12 +230,12 @@ public class ConfigurationsForTargetsTest extends AnalysisTestCase { */ protected List<ConfiguredTarget> getConfiguredDeps(String targetLabel, String attrName) throws Exception { - Multimap<Attribute, ConfiguredTargetAndTarget> allDeps = getConfiguredDeps(targetLabel); + Multimap<Attribute, ConfiguredTargetAndData> allDeps = getConfiguredDeps(targetLabel); for (Attribute attribute : allDeps.keySet()) { if (attribute.getName().equals(attrName)) { return ImmutableList.copyOf( Collections2.transform( - allDeps.get(attribute), ConfiguredTargetAndTarget::getConfiguredTarget)); + allDeps.get(attribute), ConfiguredTargetAndData::getConfiguredTarget)); } } throw new AssertionError( |