Simplify ParquetRecordBatchReader::next control logic
#7512
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
alamb
changed the title
ParquetRecordBatchReader::next control logic
alamb
commented
May 15, 2025
| @@ -800,24 +800,33 @@ impl Iterator for ParquetRecordBatchReader { | |||
| type Item = Result<RecordBatch, ArrowError>; | |||
|
|
|||
| fn next(&mut self) -> Option<Self::Item> { | |||
| self.next_inner() | |||
There was a problem hiding this comment.
Basically this PR consolidates the conversion of converting to ParquetError and transposing to a single location rather than inlining it several places in next()
| "Struct array reader should return struct array".to_string(), | ||
| ) | ||
| }); | ||
| let array = self.array_reader.consume_batch()?; |
There was a problem hiding this comment.
I think this is a pretty good example of how the logic gets simpler
alamb
force-pushed
the
alamb/simplify_batch_reader
branch
from
674748a to
7121c54
Compare
zhuqi-lucas
approved these changes
May 16, 2025
There was a problem hiding this comment.
LGTM Thank you @alamb , It makes sense we throw the error, it's clear.
|
Thank you for the review @zhuqi-lucas |
crepererum
approved these changes
May 16, 2025
alamb
added a commit
to alamb/arrow-rs
that referenced
this pull request
May 16, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Which issue does this PR close?
Rationale for this change
As part of #7456 we will likely need to change the control logic in
ParquetRecordBatchReaderHowever, at the moment the code is somewhat cumbersome to understand because it has to map any
Errinto aSome(Err..)to conform to the iterator interfaceWhat changes are included in this PR?
Move the control logic into a separate function that returns
Result<Option<..>>so that the?can be used to make the control flow logic clearerAre there any user-facing changes?