Change `getValues` to `get(Ordered)ValuesAndExceptions` in Skyframe Test files since `getValues` is going to be removed in Skyfunction. PiperOrigin-RevId: 436186631
diff --git a/src/test/java/com/google/devtools/build/skyframe/MemoizingEvaluatorTest.java b/src/test/java/com/google/devtools/build/skyframe/MemoizingEvaluatorTest.java index fa869cd..78ef058 100644 --- a/src/test/java/com/google/devtools/build/skyframe/MemoizingEvaluatorTest.java +++ b/src/test/java/com/google/devtools/build/skyframe/MemoizingEvaluatorTest.java
@@ -1132,7 +1132,7 @@ @Nullable @Override public SkyValue compute(SkyKey skyKey, Environment env) throws InterruptedException { - env.getValues(ImmutableList.of(leafKey, bKey)); + env.getOrderedValuesAndExceptions(ImmutableList.of(leafKey, bKey)); return null; } }); @@ -1243,8 +1243,8 @@ @Override public SkyValue compute(SkyKey skyKey, Environment env) throws InterruptedException { // The order here is important -- 2 before 1. - Map<SkyKey, SkyValue> result = - env.getValues(ImmutableList.of(cycleKey2, cycleKey1)); + SkyframeIterableResult result = + env.getOrderedValuesAndExceptions(ImmutableList.of(cycleKey2, cycleKey1)); Preconditions.checkState(env.valuesMissing(), result); return null; } @@ -1581,7 +1581,7 @@ @Nullable @Override public SkyValue compute(SkyKey skyKey, Environment env) throws InterruptedException { - env.getValues(ImmutableList.of(topKey, depKey)); + env.getOrderedValuesAndExceptions(ImmutableList.of(topKey, depKey)); assertThat(env.valuesMissing()).isTrue(); return null; } @@ -2114,7 +2114,7 @@ .getOrCreate(topKey) .setBuilder( (skyKey, env) -> { - env.getValues(ImmutableList.of(errorKey, midKey, mid2Key)); + env.getOrderedValuesAndExceptions(ImmutableList.of(errorKey, midKey, mid2Key)); if (env.valuesMissing()) { return null; } @@ -2153,7 +2153,8 @@ (skyKey, env) -> { SkyKeyValue val = ((SkyKeyValue) - env.getValues(ImmutableList.of(groupDepA, groupDepB)).get(groupDepA)); + env.getOrderedValuesAndExceptions(ImmutableList.of(groupDepA, groupDepB)) + .next()); if (env.valuesMissing()) { return null; } @@ -2519,7 +2520,8 @@ if (dep1 == null) { return null; } - env.getValues(ImmutableList.of(newlyRequestedDoneDep, newlyRequestedNotDoneDep)); + env.getOrderedValuesAndExceptions( + ImmutableList.of(newlyRequestedDoneDep, newlyRequestedNotDoneDep)); if (numFunctionCalls.get() < 4) { return Restart.SELF; } else if (numFunctionCalls.get() == 4) { @@ -2606,7 +2608,7 @@ @Override public SkyValue compute(SkyKey skyKey, Environment env) throws InterruptedException { if (sameGroup) { - env.getValues(ImmutableSet.of(presentChild, missingChild)); + env.getOrderedValuesAndExceptions(ImmutableSet.of(presentChild, missingChild)); } else { env.getValue(presentChild); if (env.valuesMissing()) { @@ -2691,14 +2693,14 @@ // Request the first group, [leaf0, leaf1, leaf2]. // In the first build, it has values ["leaf2", "leaf3", "leaf4"]. // In the second build it has values ["leaf2", "leaf3", "leaf5"] - Map<SkyKey, SkyValue> values = env.getValues(leaves); + SkyframeLookupResult values = env.getValuesAndExceptions(leaves); if (env.valuesMissing()) { return null; } // Request the second group. In the first build it's [leaf2, leaf4]. // In the second build it's [leaf2, leaf5] - env.getValues( + env.getOrderedValuesAndExceptions( ImmutableList.of( leaves.get(2), GraphTester.toSkyKey(((StringValue) values.get(leaves.get(2))).getValue())));
diff --git a/src/test/java/com/google/devtools/build/skyframe/ParallelEvaluatorTest.java b/src/test/java/com/google/devtools/build/skyframe/ParallelEvaluatorTest.java index 124a5fa..5946893 100644 --- a/src/test/java/com/google/devtools/build/skyframe/ParallelEvaluatorTest.java +++ b/src/test/java/com/google/devtools/build/skyframe/ParallelEvaluatorTest.java
@@ -923,7 +923,7 @@ @Nullable @Override public SkyValue compute(SkyKey skyKey, Environment env) throws InterruptedException { - env.getValues(ImmutableList.of(cycleKey)); + env.getValue(cycleKey); return env.valuesMissing() ? null : topValue; } }); @@ -934,7 +934,7 @@ @Nullable @Override public SkyValue compute(SkyKey skyKey, Environment env) throws InterruptedException { - env.getValues(ImmutableList.of(cycleKey, catastropheKey)); + env.getOrderedValuesAndExceptions(ImmutableList.of(cycleKey, catastropheKey)); Preconditions.checkState(env.valuesMissing()); return null; } @@ -2042,7 +2042,7 @@ } catch (SomeErrorException e) { // Recover from the child error. } - env.getValues(deps); + env.getOrderedValuesAndExceptions(deps); if (env.valuesMissing()) { return null; }