-
Notifications
You must be signed in to change notification settings - Fork 1.2k
[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
Changes from 3 commits
6f1d112
be939ef
55e9d82
1cb0cdc
afa2d1c
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| 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]); | ||
|
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. 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
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. |
||
| 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(), | ||
| )?; | ||
|
|
||
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.
I don't think we should add this in the parquet crate as it will conflict with downstream crates that want to use a different allocator
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 is only dev dependency, used to make benchmark more accurate
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.
Let's get some benchmark results with the different allocator
However, I still don't think it is a good idea to use a non-system allocator for dev/benchmarks as it will make the benchmarks potentially farther from what the (average) user actually experiences
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.
make sense, I've removed mimalloc