-
Notifications
You must be signed in to change notification settings - Fork 1.1k
[Parquet] Reduce one copy in SerializedPageReader
#8745
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.
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
Merged
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
6f1d112
mimalloc
XiangpengHao be939ef
reduce copy
XiangpengHao 55e9d82
Merge branch 'main' into reduce-copy
XiangpengHao 1cb0cdc
remove mimalloc
XiangpengHao afa2d1c
Merge branch 'reduce-copy' of https://github.com/XiangpengHao/arrow-r…
XiangpengHao File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -397,9 +397,9 @@ pub(crate) fn decode_page( | |
| } | ||
| let decompressed_size = uncompressed_page_size - offset; | ||
| let mut decompressed = Vec::with_capacity(uncompressed_page_size); | ||
| decompressed.extend_from_slice(&buffer.as_ref()[..offset]); | ||
| decompressed.extend_from_slice(&buffer[..offset]); | ||
| if decompressed_size > 0 { | ||
| let compressed = &buffer.as_ref()[offset..]; | ||
| let compressed = &buffer[offset..]; | ||
| decompressor.decompress(compressed, &mut decompressed, Some(decompressed_size))?; | ||
| } | ||
|
|
||
|
|
@@ -897,31 +897,23 @@ impl<R: ChunkReader> PageReader for SerializedPageReader<R> { | |
| *remaining, | ||
| )?; | ||
| let data_len = header.compressed_page_size as usize; | ||
| let data_start = *offset; | ||
| *offset += data_len as u64; | ||
| *remaining -= data_len as u64; | ||
|
|
||
| if header.r#type == PageType::INDEX_PAGE { | ||
| continue; | ||
| } | ||
|
|
||
| let mut buffer = Vec::with_capacity(data_len); | ||
| let read = read.take(data_len as u64).read_to_end(&mut buffer)?; | ||
|
|
||
| if read != data_len { | ||
| return Err(eof_err!( | ||
| "Expected to read {} bytes of page, read only {}", | ||
| data_len, | ||
| read | ||
| )); | ||
| } | ||
| let buffer = self.reader.get_bytes(data_start, data_len)?; | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I confirm on review this can potentially avoid a copy if the underlying reader is already |
||
|
|
||
| let buffer = | ||
| self.context | ||
| .decrypt_page_data(buffer, *page_index, *require_dictionary)?; | ||
|
|
||
| let page = decode_page( | ||
| header, | ||
| Bytes::from(buffer), | ||
| buffer, | ||
| self.physical_type, | ||
| self.decompressor.as_mut(), | ||
| )?; | ||
|
|
||
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This seems an unrelated (but nice) cleanup
While looking at this code, it seems like it always copies the compressed bytes, even when it then decompresses it immediately. I'll make a small PR to see if I can remove that unecessary copy
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Follow on: