From 81e90cebf7245b70e7b5056a22560c4ebaf66d07 Mon Sep 17 00:00:00 2001 From: Mateusz Gajewski Date: Wed, 6 Oct 2021 12:05:51 +0200 Subject: [PATCH] Remove compiler warning for reserved identifier in future JDKs --- .../io/trino/operator/ExchangeClient.java | 2 +- .../java/io/trino/operator/PageBuffer.java | 4 ++-- .../ScanFilterAndProjectOperator.java | 4 ++-- .../TableScanWorkProcessorOperator.java | 2 +- .../java/io/trino/operator/WorkProcessor.java | 8 +++---- .../io/trino/operator/WorkProcessorUtils.java | 14 ++++++------ .../exchange/LocalExchangeSource.java | 2 +- .../operator/join/DefaultPageJoiner.java | 4 ++-- .../trino/operator/project/PageProcessor.java | 4 ++-- .../io/trino/operator/TestWorkProcessor.java | 22 +++++++++---------- 10 files changed, 33 insertions(+), 33 deletions(-) diff --git a/core/trino-main/src/main/java/io/trino/operator/ExchangeClient.java b/core/trino-main/src/main/java/io/trino/operator/ExchangeClient.java index d1b795d82e47..97cb904ef276 100644 --- a/core/trino-main/src/main/java/io/trino/operator/ExchangeClient.java +++ b/core/trino-main/src/main/java/io/trino/operator/ExchangeClient.java @@ -200,7 +200,7 @@ public WorkProcessor pages() return ProcessState.blocked(blocked); } - return ProcessState.yield(); + return ProcessState.yielded(); } return ProcessState.ofResult(page); diff --git a/core/trino-main/src/main/java/io/trino/operator/PageBuffer.java b/core/trino-main/src/main/java/io/trino/operator/PageBuffer.java index 77aaffdc09a2..335348411cb3 100644 --- a/core/trino-main/src/main/java/io/trino/operator/PageBuffer.java +++ b/core/trino-main/src/main/java/io/trino/operator/PageBuffer.java @@ -24,7 +24,7 @@ import static io.trino.operator.WorkProcessor.ProcessState.blocked; import static io.trino.operator.WorkProcessor.ProcessState.finished; import static io.trino.operator.WorkProcessor.ProcessState.ofResult; -import static io.trino.operator.WorkProcessor.ProcessState.yield; +import static io.trino.operator.WorkProcessor.ProcessState.yielded; import static java.util.Objects.requireNonNull; /** @@ -67,7 +67,7 @@ public WorkProcessor pages() return ofResult(result); } - return yield(); + return yielded(); }); } diff --git a/core/trino-main/src/main/java/io/trino/operator/ScanFilterAndProjectOperator.java b/core/trino-main/src/main/java/io/trino/operator/ScanFilterAndProjectOperator.java index 60384a1891b3..e03f5f16a8f7 100644 --- a/core/trino-main/src/main/java/io/trino/operator/ScanFilterAndProjectOperator.java +++ b/core/trino-main/src/main/java/io/trino/operator/ScanFilterAndProjectOperator.java @@ -360,7 +360,7 @@ else if (finished) { } else { outputMemoryContext.setBytes(pageBuilder.getRetainedSizeInBytes()); - return ProcessState.yield(); + return ProcessState.yielded(); } } } @@ -395,7 +395,7 @@ public ProcessState process() return ProcessState.finished(); } else { - return ProcessState.yield(); + return ProcessState.yielded(); } } diff --git a/core/trino-main/src/main/java/io/trino/operator/TableScanWorkProcessorOperator.java b/core/trino-main/src/main/java/io/trino/operator/TableScanWorkProcessorOperator.java index 7ca644fcbe08..c2f70285256c 100644 --- a/core/trino-main/src/main/java/io/trino/operator/TableScanWorkProcessorOperator.java +++ b/core/trino-main/src/main/java/io/trino/operator/TableScanWorkProcessorOperator.java @@ -295,7 +295,7 @@ public ProcessState process() return ProcessState.finished(); } else { - return ProcessState.yield(); + return ProcessState.yielded(); } } diff --git a/core/trino-main/src/main/java/io/trino/operator/WorkProcessor.java b/core/trino-main/src/main/java/io/trino/operator/WorkProcessor.java index 019eefc65132..dbbb18fd0f35 100644 --- a/core/trino-main/src/main/java/io/trino/operator/WorkProcessor.java +++ b/core/trino-main/src/main/java/io/trino/operator/WorkProcessor.java @@ -177,7 +177,7 @@ interface Transformation * @return the current transformation state, optionally bearing a result * @see TransformationState#needsMoreData() * @see TransformationState#blocked(ListenableFuture) - * @see TransformationState#yield() + * @see TransformationState#yielded() * @see TransformationState#ofResult(Object) * @see TransformationState#ofResult(Object, boolean) * @see TransformationState#finished() @@ -192,7 +192,7 @@ interface Process * * @return the current state, optionally bearing a result * @see ProcessState#blocked(ListenableFuture) - * @see ProcessState#yield() + * @see ProcessState#yielded() * @see ProcessState#ofResult(Object) * @see ProcessState#finished() */ @@ -254,7 +254,7 @@ public static TransformationState blocked(ListenableFuture blocked) * Signals that transformation has yielded. {@link #process()} will be called again with the same input element. */ @SuppressWarnings("unchecked") - public static TransformationState yield() + public static TransformationState yielded() { return (TransformationState) YIELD_STATE; } @@ -349,7 +349,7 @@ public static ProcessState blocked(ListenableFuture blocked) * Signals that process has yielded. {@link #process()} will be called again later. */ @SuppressWarnings("unchecked") - public static ProcessState yield() + public static ProcessState yielded() { return (ProcessState) YIELD_STATE; } diff --git a/core/trino-main/src/main/java/io/trino/operator/WorkProcessorUtils.java b/core/trino-main/src/main/java/io/trino/operator/WorkProcessorUtils.java index f379be407665..f2d0e6d73f9e 100644 --- a/core/trino-main/src/main/java/io/trino/operator/WorkProcessorUtils.java +++ b/core/trino-main/src/main/java/io/trino/operator/WorkProcessorUtils.java @@ -131,7 +131,7 @@ else if (processor.isBlocked()) { return ProcessState.blocked(processor.getBlockedFuture()); } else { - return ProcessState.yield(); + return ProcessState.yielded(); } if (processorIterator.hasNext()) { @@ -174,7 +174,7 @@ public ProcessState process() { if (!lastProcessYielded && yieldSignal.getAsBoolean()) { lastProcessYielded = true; - return ProcessState.yield(); + return ProcessState.yielded(); } lastProcessYielded = false; @@ -230,7 +230,7 @@ private static ProcessState getNextState(WorkProcessor processor) return ProcessState.blocked(processor.getBlockedFuture()); } - return ProcessState.yield(); + return ProcessState.yielded(); } static WorkProcessor flatMap(WorkProcessor processor, Function> mapper) @@ -286,7 +286,7 @@ static WorkProcessor flatten(WorkProcessor> processor) return TransformationState.blocked(nestedProcessor.getBlockedFuture()); } - return TransformationState.yield(); + return TransformationState.yielded(); }); } @@ -312,7 +312,7 @@ else if (processor.isBlocked()) { return ProcessState.blocked(processor.getBlockedFuture()); } else { - return ProcessState.yield(); + return ProcessState.yielded(); } } @@ -331,7 +331,7 @@ else if (processor.isBlocked()) { case BLOCKED: return ProcessState.blocked(state.getBlocked()); case YIELD: - return ProcessState.yield(); + return ProcessState.yielded(); case RESULT: return ProcessState.ofResult(state.getResult()); case FINISHED: @@ -353,7 +353,7 @@ private static class ProcessWorkProcessor @Nullable WorkProcessor.Process process; // set initial state to yield as it will cause processor computations to progress - ProcessState state = ProcessState.yield(); + ProcessState state = ProcessState.yielded(); ProcessWorkProcessor(WorkProcessor.Process process) { diff --git a/core/trino-main/src/main/java/io/trino/operator/exchange/LocalExchangeSource.java b/core/trino-main/src/main/java/io/trino/operator/exchange/LocalExchangeSource.java index d010fa276278..834529e05c67 100644 --- a/core/trino-main/src/main/java/io/trino/operator/exchange/LocalExchangeSource.java +++ b/core/trino-main/src/main/java/io/trino/operator/exchange/LocalExchangeSource.java @@ -111,7 +111,7 @@ public WorkProcessor pages() return ProcessState.blocked(blocked); } - return ProcessState.yield(); + return ProcessState.yielded(); } return ProcessState.ofResult(page); diff --git a/core/trino-main/src/main/java/io/trino/operator/join/DefaultPageJoiner.java b/core/trino-main/src/main/java/io/trino/operator/join/DefaultPageJoiner.java index 5929c3910298..b7f86cef46e9 100644 --- a/core/trino-main/src/main/java/io/trino/operator/join/DefaultPageJoiner.java +++ b/core/trino-main/src/main/java/io/trino/operator/join/DefaultPageJoiner.java @@ -53,7 +53,7 @@ import static io.trino.operator.WorkProcessor.TransformationState.finished; import static io.trino.operator.WorkProcessor.TransformationState.needsMoreData; import static io.trino.operator.WorkProcessor.TransformationState.ofResult; -import static io.trino.operator.WorkProcessor.TransformationState.yield; +import static io.trino.operator.WorkProcessor.TransformationState.yielded; import static io.trino.operator.join.LookupJoinOperatorFactory.JoinType.FULL_OUTER; import static io.trino.operator.join.LookupJoinOperatorFactory.JoinType.PROBE_OUTER; import static io.trino.operator.join.PartitionedLookupSourceFactory.NO_SPILL_EPOCH; @@ -205,7 +205,7 @@ else if (!spillInProgress.isDone()) { return ofResult(buildOutputPage(), false); } - return yield(); + return yielded(); } if (!pageBuilder.isEmpty() || finishing) { diff --git a/core/trino-main/src/main/java/io/trino/operator/project/PageProcessor.java b/core/trino-main/src/main/java/io/trino/operator/project/PageProcessor.java index c47bad9eb6e9..ee7cb556f3da 100644 --- a/core/trino-main/src/main/java/io/trino/operator/project/PageProcessor.java +++ b/core/trino-main/src/main/java/io/trino/operator/project/PageProcessor.java @@ -45,7 +45,7 @@ import static io.trino.operator.PageUtils.recordMaterializedBytes; import static io.trino.operator.WorkProcessor.ProcessState.finished; import static io.trino.operator.WorkProcessor.ProcessState.ofResult; -import static io.trino.operator.WorkProcessor.ProcessState.yield; +import static io.trino.operator.WorkProcessor.ProcessState.yielded; import static io.trino.operator.project.SelectedPositions.positionsRange; import static io.trino.spi.block.DictionaryId.randomDictionaryId; import static java.util.Objects.requireNonNull; @@ -213,7 +213,7 @@ public ProcessState process() lastComputeYielded = true; lastComputeBatchSize = batchSize; updateRetainedSize(); - return yield(); + return yielded(); } if (result.isPageTooLarge()) { diff --git a/core/trino-main/src/test/java/io/trino/operator/TestWorkProcessor.java b/core/trino-main/src/test/java/io/trino/operator/TestWorkProcessor.java index ab6159d2e572..c8a9a3eb3833 100644 --- a/core/trino-main/src/test/java/io/trino/operator/TestWorkProcessor.java +++ b/core/trino-main/src/test/java/io/trino/operator/TestWorkProcessor.java @@ -64,7 +64,7 @@ public void testIterator() public void testIteratorFailsWhenWorkProcessorHasYielded() { // iterator should fail if underlying work has yielded - WorkProcessor processor = processorFrom(ImmutableList.of(ProcessState.yield())); + WorkProcessor processor = processorFrom(ImmutableList.of(ProcessState.yielded())); Iterator iterator = processor.iterator(); //noinspection ResultOfMethodCallIgnored assertThatThrownBy(iterator::hasNext) @@ -90,7 +90,7 @@ public void testMergeSorted() List> firstStream = ImmutableList.of( ProcessState.ofResult(1), ProcessState.ofResult(3), - ProcessState.yield(), + ProcessState.yielded(), ProcessState.ofResult(5), ProcessState.finished()); @@ -139,7 +139,7 @@ public void testMergeSortedEmptyStreams() SettableFuture firstFuture = SettableFuture.create(); List> firstStream = ImmutableList.of( ProcessState.blocked(firstFuture), - ProcessState.yield(), + ProcessState.yielded(), ProcessState.finished()); SettableFuture secondFuture = SettableFuture.create(); @@ -240,7 +240,7 @@ public void testProcessStateMonitor() List> baseScenario = ImmutableList.of( ProcessState.ofResult(1), - ProcessState.yield(), + ProcessState.yielded(), ProcessState.blocked(future), ProcessState.finished()); @@ -266,7 +266,7 @@ public void testFinished() List> scenario = ImmutableList.of( ProcessState.ofResult(1), - ProcessState.yield(), + ProcessState.yielded(), ProcessState.blocked(future), ProcessState.ofResult(2)); @@ -326,7 +326,7 @@ public void testFlatTransform() ProcessState.ofResult(1.0), ProcessState.blocked(baseFuture), ProcessState.ofResult(2.0), - ProcessState.yield(), + ProcessState.yielded(), ProcessState.ofResult(3.0), ProcessState.ofResult(4.0), ProcessState.finished()); @@ -334,7 +334,7 @@ public void testFlatTransform() SettableFuture mappedFuture1 = SettableFuture.create(); List> mappedScenario1 = ImmutableList.of( ProcessState.ofResult(1), - ProcessState.yield(), + ProcessState.yielded(), ProcessState.blocked(mappedFuture1), ProcessState.ofResult(2), ProcessState.finished()); @@ -411,7 +411,7 @@ public void testTransform() SettableFuture baseFuture = SettableFuture.create(); List> baseScenario = ImmutableList.of( ProcessState.ofResult(1), - ProcessState.yield(), + ProcessState.yielded(), ProcessState.blocked(baseFuture), ProcessState.ofResult(2), ProcessState.ofResult(3), @@ -422,7 +422,7 @@ public void testTransform() Transform.of(Optional.of(1), TransformationState.needsMoreData()), Transform.of(Optional.of(2), TransformationState.ofResult("foo")), Transform.of(Optional.of(3), TransformationState.blocked(transformationFuture)), - Transform.of(Optional.of(3), TransformationState.yield()), + Transform.of(Optional.of(3), TransformationState.yielded()), Transform.of(Optional.of(3), TransformationState.ofResult("bar", false)), Transform.of(Optional.of(3), TransformationState.ofResult("zoo", true)), Transform.of(Optional.empty(), TransformationState.ofResult("car", false)), @@ -474,10 +474,10 @@ public void testCreateFrom() { SettableFuture future = SettableFuture.create(); List> scenario = ImmutableList.of( - ProcessState.yield(), + ProcessState.yielded(), ProcessState.ofResult(1), ProcessState.blocked(future), - ProcessState.yield(), + ProcessState.yielded(), ProcessState.ofResult(2), ProcessState.finished()); WorkProcessor processor = processorFrom(scenario);