Refactor stream retrieval and datatype iterators #36
Conversation
This file contains 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
Jefffrey
commented
Nov 12, 2023
Comment on lines
+890
to
+894
| pub fn get(&self, column: &Column, kind: Kind) -> Result<Decompressor> { | ||
| self.get_opt(column, kind).context(InvalidColumnSnafu { | ||
| name: column.name(), | ||
| }) | ||
| } |
There was a problem hiding this comment.
Instead of having to handle the case where column stream doesn't exist everywhere we call, just centralize the err here
Comment on lines
+46
to
+60
| impl DirectBinaryIterator { | ||
| fn iter_next(&mut self) -> Result<Option<Vec<u8>>> { | ||
| let next = match self.lengths.next() { | ||
| Some(length) => Some(self.values.next(length? as usize)?.to_vec()), | ||
| None => None, | ||
| }; | ||
| Ok(next) | ||
| } | ||
| } | ||
|
|
||
| impl Iterator for DirectBinaryIterator { | ||
| type Item = error::Result<Vec<u8>>; | ||
| type Item = Result<Vec<u8>>; | ||
|
|
||
| fn next(&mut self) -> Option<Self::Item> { | ||
| match self.lengths.next() { | ||
| Some(Ok(length)) => match self.values.next(length as usize) { | ||
| Ok(value) => Some(Ok(value.to_vec())), | ||
| Err(err) => Some(Err(err)), | ||
| }, | ||
| Some(Err(err)) => Some(Err(err)), | ||
| None => None, | ||
| } | ||
| self.iter_next().transpose() |
There was a problem hiding this comment.
Idea of this pattern is to be able to utilize ? to simplify code a bit (no need to handle Some(Ok(length)) which then has to again match)
| @@ -51,7 +51,7 @@ pub fn get_direct_signed_rle_reader<R: Read + Send + 'static>( | |||
| match column.encoding().kind() { | |||
| crate::proto::column_encoding::Kind::Direct => Ok(Box::new(SignedRleReaderV1::new(reader))), | |||
| crate::proto::column_encoding::Kind::DirectV2 => { | |||
| Ok(Box::new(RleReaderV2::try_new(reader, true, true))) | |||
| Ok(Box::new(RleReaderV2::new(reader, true, true))) | |||
There was a problem hiding this comment.
try_new should only be used if returning a Result
WenyXu
approved these changes
Nov 12, 2023
progval
pushed a commit
to progval/datafusion-orc
that referenced
this pull request
Mar 6, 2024
Feature/fix datatypes
waynexia
pushed a commit
that referenced
this pull request
Oct 24, 2024
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.
No description provided.