Skip to content

GH-3767: Make PageReader AutoCloseable #3768

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
abstractdog wants to merge 1 commit into
base: master
Choose a base branch
from
+10 −3
Open

GH-3767: Make PageReader AutoCloseable #3768

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion parquet-column/src/main/java/org/apache/parquet/column/page/PageReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
/**
* Reader for a sequence a page from a given column chunk
*/
public interface PageReader {
public interface PageReader extends AutoCloseable {

/**
* @return the dictionary page in that chunk or null if none
Expand All @@ -37,4 +37,10 @@ public interface PageReader {
* @return the next page in that chunk or null if after the last page
*/
DataPage readPage();

/**
* Releases any resources this reader holds (buffers, native handles, etc.).
*/
@Override
default void close() {}
}
5 changes: 3 additions & 2 deletions parquet-hadoop/src/main/java/org/apache/parquet/hadoop/ColumnChunkPageReadStore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,8 @@ public DictionaryPage readDictionaryPage() {
}
}

private void releaseBuffers() {
@Override
public void close() {
releaser.close();
}
}
Expand Down Expand Up @@ -415,7 +416,7 @@ public void close() {
// Wrap each reader + the releaser as an AutoCloseable so AutoCloseables.uncheckedClose()
// releases every resource even if one fails, and aggregates failures via suppressed exceptions
List<AutoCloseable> toClose = new ArrayList<>(readers.size() + 1);
readers.values().forEach(reader -> toClose.add(reader::releaseBuffers));
readers.values().forEach(reader -> toClose.add(reader));
toClose.add(releaser);
AutoCloseables.uncheckedClose(toClose);
}
Expand Down
Loading