This is an automated email from the ASF dual-hosted git repository.
pchenxi pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/gravitino.git
The following commit(s) were added to refs/heads/main by this push:
new 1365a62dc7 [#9142] fix(trino-connector): Fix `getNextPage()` to Return
`null` After Completion (#9224)
1365a62dc7 is described below
commit 1365a62dc7bd95659b3cadf0e59e76c5d13175d4
Author: Harsh Mehta <[email protected]>
AuthorDate: Tue Nov 25 15:24:41 2025 +0530
[#9142] fix(trino-connector): Fix `getNextPage()` to Return `null` After
Completion (#9224)
### What changes were proposed in this pull request?
This PR fixes the behavior of `SystemTablePageSource#getNextPage()` so
that it returns the page only on the first call and returns null on all
subsequent calls. A new isFinished flag is introduced to track whether
the page has already been consumed.
### Why are the changes needed?
Previously, `getNextPage()` could return the same page multiple times,
which violated the expected contract and caused unit tests to fail. The
method should provide the page exactly once and then signal completion
by returning null.
Fixed #9142
### Does this PR introduce any user-facing change?
No. This change affects only internal behavior of the page source
implementation and does not modify any user-facing APIs, configuration,
or output.
### How was this patch tested?
Unit tests were used to verify that `getNextPage()` returns the page
only once and that all subsequent calls consistently return null.
---------
Signed-off-by: Harsh Mehta <[email protected]>
---
.../connector/system/GravitinoSystemConnector.java | 3 ++
.../system/TestGravitinoSystemConnector.java | 58 ++++++++++++++++++++++
2 files changed, 61 insertions(+)
diff --git
a/trino-connector/trino-connector/src/main/java/org/apache/gravitino/trino/connector/system/GravitinoSystemConnector.java
b/trino-connector/trino-connector/src/main/java/org/apache/gravitino/trino/connector/system/GravitinoSystemConnector.java
index 51b782f95d..c6b894170c 100644
---
a/trino-connector/trino-connector/src/main/java/org/apache/gravitino/trino/connector/system/GravitinoSystemConnector.java
+++
b/trino-connector/trino-connector/src/main/java/org/apache/gravitino/trino/connector/system/GravitinoSystemConnector.java
@@ -205,6 +205,9 @@ public class GravitinoSystemConnector implements Connector {
@Override
public Page getNextPage() {
+ if (isFinished) {
+ return null;
+ }
isFinished = true;
return page;
}
diff --git
a/trino-connector/trino-connector/src/test/java/org/apache/gravitino/trino/connector/system/TestGravitinoSystemConnector.java
b/trino-connector/trino-connector/src/test/java/org/apache/gravitino/trino/connector/system/TestGravitinoSystemConnector.java
new file mode 100644
index 0000000000..372b9f2b88
--- /dev/null
+++
b/trino-connector/trino-connector/src/test/java/org/apache/gravitino/trino/connector/system/TestGravitinoSystemConnector.java
@@ -0,0 +1,58 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.gravitino.trino.connector.system;
+
+import io.trino.spi.Page;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+public class TestGravitinoSystemConnector {
+ @Test
+ public void testSystemTablePageSourceReturnsPageOnlyOnce() throws Exception {
+ Page page = new Page(0);
+ try (GravitinoSystemConnector.SystemTablePageSource pageSource =
+ new GravitinoSystemConnector.SystemTablePageSource(page)) {
+
+ Assertions.assertFalse(pageSource.isFinished());
+ Assertions.assertSame(page, pageSource.getNextPage());
+ Assertions.assertTrue(pageSource.isFinished());
+ Assertions.assertNull(pageSource.getNextPage());
+ }
+ }
+
+ @Test
+ public void testSystemTablePageSourceMultipleGetNextPageCalls() throws
Exception {
+ Page page = new Page(0);
+ try (GravitinoSystemConnector.SystemTablePageSource pageSource =
+ new GravitinoSystemConnector.SystemTablePageSource(page)) {
+
+ // First call should return the page
+ Page firstPage = pageSource.getNextPage();
+ Assertions.assertNotNull(firstPage);
+ Assertions.assertSame(page, firstPage);
+ Assertions.assertTrue(pageSource.isFinished());
+
+ // Subsequent calls should return null
+ Assertions.assertNull(pageSource.getNextPage());
+ Assertions.assertNull(pageSource.getNextPage());
+ Assertions.assertNull(pageSource.getNextPage());
+ Assertions.assertTrue(pageSource.isFinished());
+ }
+ }
+}
