From d48185987b26dd7ec6157e6987f7b179eb9f0508 Mon Sep 17 00:00:00 2001 From: Yuya Ebihara Date: Thu, 17 Jul 2025 13:20:28 +0900 Subject: [PATCH] Remove deprecated ConnectorPageSource.getNextPage --- .../connector/MockConnectorPageSource.java | 8 -------- core/trino-spi/pom.xml | 18 ++++++++++++++++++ .../spi/connector/ConnectorPageSource.java | 18 +----------------- .../trino/spi/connector/EmptyPageSource.java | 9 --------- .../trino/spi/connector/FixedPageSource.java | 5 ++--- .../trino/spi/connector/RecordPageSource.java | 5 ++--- 6 files changed, 23 insertions(+), 40 deletions(-) diff --git a/core/trino-main/src/test/java/io/trino/connector/MockConnectorPageSource.java b/core/trino-main/src/test/java/io/trino/connector/MockConnectorPageSource.java index f16ae6d43e08..04b9c7144c06 100644 --- a/core/trino-main/src/test/java/io/trino/connector/MockConnectorPageSource.java +++ b/core/trino-main/src/test/java/io/trino/connector/MockConnectorPageSource.java @@ -13,7 +13,6 @@ */ package io.trino.connector; -import io.trino.spi.Page; import io.trino.spi.connector.ConnectorPageSource; import io.trino.spi.connector.SourcePage; import io.trino.spi.metrics.Metrics; @@ -60,13 +59,6 @@ public boolean isFinished() return delegate.isFinished(); } - @Override - @SuppressWarnings("removal") - public Page getNextPage() - { - return delegate.getNextPage(); - } - @Override public SourcePage getNextSourcePage() { diff --git a/core/trino-spi/pom.xml b/core/trino-spi/pom.xml index ad44a7419cfd..caeafb0f7ee2 100644 --- a/core/trino-spi/pom.xml +++ b/core/trino-spi/pom.xml @@ -662,6 +662,24 @@ java.annotation.removed io.trino.spi.Experimental + + true + java.method.removed + method io.trino.spi.Page io.trino.spi.connector.EmptyPageSource::getNextPage() + Deprecated + + + true + java.method.removed + method io.trino.spi.Page io.trino.spi.connector.FixedPageSource::getNextPage() + Deprecated + + + true + java.method.removed + method io.trino.spi.Page io.trino.spi.connector.RecordPageSource::getNextPage() + Deprecated + diff --git a/core/trino-spi/src/main/java/io/trino/spi/connector/ConnectorPageSource.java b/core/trino-spi/src/main/java/io/trino/spi/connector/ConnectorPageSource.java index 7a5ee82a9d51..df67aa3233f3 100644 --- a/core/trino-spi/src/main/java/io/trino/spi/connector/ConnectorPageSource.java +++ b/core/trino-spi/src/main/java/io/trino/spi/connector/ConnectorPageSource.java @@ -13,7 +13,6 @@ */ package io.trino.spi.connector; -import io.trino.spi.Page; import io.trino.spi.metrics.Metrics; import java.io.Closeable; @@ -53,27 +52,12 @@ default OptionalLong getCompletedPositions() */ boolean isFinished(); - /** - * Gets the next page of data. This method is allowed to return null. - * - * @deprecated Use {@link #getNextSourcePage()} instead - */ - @Deprecated(forRemoval = true) - default Page getNextPage() - { - throw new UnsupportedOperationException(); - } - /** * Gets the next page of data. This method is allowed to return null. */ default SourcePage getNextSourcePage() { - Page nextPage = getNextPage(); - if (nextPage == null) { - return null; - } - return SourcePage.create(nextPage); + throw new UnsupportedOperationException(); } /** diff --git a/core/trino-spi/src/main/java/io/trino/spi/connector/EmptyPageSource.java b/core/trino-spi/src/main/java/io/trino/spi/connector/EmptyPageSource.java index 0ff0106f3120..4d293453473a 100644 --- a/core/trino-spi/src/main/java/io/trino/spi/connector/EmptyPageSource.java +++ b/core/trino-spi/src/main/java/io/trino/spi/connector/EmptyPageSource.java @@ -13,8 +13,6 @@ */ package io.trino.spi.connector; -import io.trino.spi.Page; - public class EmptyPageSource implements ConnectorPageSource { @@ -36,13 +34,6 @@ public boolean isFinished() return true; } - @Override - @SuppressWarnings("removal") - public Page getNextPage() - { - return null; - } - @Override public SourcePage getNextSourcePage() { diff --git a/core/trino-spi/src/main/java/io/trino/spi/connector/FixedPageSource.java b/core/trino-spi/src/main/java/io/trino/spi/connector/FixedPageSource.java index 50a3d4057546..cbb04ac211eb 100644 --- a/core/trino-spi/src/main/java/io/trino/spi/connector/FixedPageSource.java +++ b/core/trino-spi/src/main/java/io/trino/spi/connector/FixedPageSource.java @@ -74,15 +74,14 @@ public boolean isFinished() } @Override - @SuppressWarnings("removal") - public Page getNextPage() + public SourcePage getNextSourcePage() { if (isFinished()) { return null; } Page page = pages.next(); completedBytes += page.getSizeInBytes(); - return page; + return SourcePage.create(page); } @Override diff --git a/core/trino-spi/src/main/java/io/trino/spi/connector/RecordPageSource.java b/core/trino-spi/src/main/java/io/trino/spi/connector/RecordPageSource.java index fd30bea015c5..35d1af399ebd 100644 --- a/core/trino-spi/src/main/java/io/trino/spi/connector/RecordPageSource.java +++ b/core/trino-spi/src/main/java/io/trino/spi/connector/RecordPageSource.java @@ -81,8 +81,7 @@ public boolean isFinished() } @Override - @SuppressWarnings("removal") - public Page getNextPage() + public SourcePage getNextSourcePage() { if (!closed) { for (int i = 0; i < ROWS_PER_REQUEST && !pageBuilder.isFull(); i++) { @@ -125,7 +124,7 @@ else if (javaType == Slice.class) { if ((closed && !pageBuilder.isEmpty()) || pageBuilder.isFull()) { Page page = pageBuilder.build(); pageBuilder.reset(); - return page; + return SourcePage.create(page); } return null;