Skip to content
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

[BUG] Bump up max_header_size #3068

Merged
merged 6 commits into from
Oct 23, 2024
Merged

[BUG] Bump up max_header_size #3068

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7071483
Bump up max_header_size that's being used to read parquet page-header
Oct 17, 2024
0ca23ba
Add comment; updates names of parameters to functions
Oct 18, 2024
7da3ed2
Merge branch 'main' into bug/parquet-large-files-reader
Oct 20, 2024
dd37741
Add logic to force convert all utf8's and binary's to large their var…
Oct 23, 2024
a9b1ccf
Merge branch 'main' into bug/parquet-large-files-reader
Oct 23, 2024
d39da8e
Revert force conversion for utf8 and binaries to their large counterp…
Oct 23, 2024
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
13 changes: 6 additions & 7 deletions src/daft-parquet/src/file.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,10 +313,9 @@ pub struct ParquetFileReader {

impl ParquetFileReader {
const DEFAULT_CHUNK_SIZE: usize = 2048;
// Set to a very high number 256MB to guard against unbounded large
// downloads from remote storage, which likely indicates corrupted Parquet data
// See: https://github.com/Eventual-Inc/Daft/issues/1551
const MAX_HEADER_SIZE: usize = 256 * 1024 * 1024;
// Set to 2GB because that's the maximum size of strings allowable by Parquet (using i32 offsets).
// See issue: https://github.com/Eventual-Inc/Daft/issues/3007
const MAX_PAGE_SIZE: usize = 2 * 1024 * 1024 * 1024;

fn new(
uri: String,
Expand Down Expand Up @@ -473,7 +472,7 @@ impl ParquetFileReader {
range_reader,
vec![],
Arc::new(|_, _| true),
Self::MAX_HEADER_SIZE,
Self::MAX_PAGE_SIZE,
)
.with_context(
|_| UnableToCreateParquetPageStreamSnafu::<String> {
Expand Down Expand Up @@ -638,7 +637,7 @@ impl ParquetFileReader {
range_reader,
vec![],
Arc::new(|_, _| true),
Self::MAX_HEADER_SIZE,
Self::MAX_PAGE_SIZE,
)
.with_context(|_| {
UnableToCreateParquetPageStreamSnafu::<String> {
Expand Down Expand Up @@ -821,7 +820,7 @@ impl ParquetFileReader {
range_reader,
vec![],
Arc::new(|_, _| true),
Self::MAX_HEADER_SIZE,
Self::MAX_PAGE_SIZE,
)
.with_context(|_| {
UnableToCreateParquetPageStreamSnafu::<String> {
Expand Down
8 changes: 4 additions & 4 deletions src/parquet2/src/read/page/stream.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ pub async fn get_page_stream_from_column_start<'a, R: AsyncRead + Unpin + Send>(
reader: &'a mut R,
scratch: Vec<u8>,
pages_filter: PageFilter,
max_header_size: usize,
max_page_size: usize,
) -> Result<impl Stream<Item = Result<CompressedPage>> + 'a> {
let page_metadata: PageMetaData = column_metadata.into();
Ok(_get_page_stream(
Expand All @@ -47,7 +47,7 @@ pub async fn get_page_stream_from_column_start<'a, R: AsyncRead + Unpin + Send>(
page_metadata.descriptor,
scratch,
pages_filter,
max_header_size,
max_page_size,
))
}

Expand All @@ -56,7 +56,7 @@ pub fn get_owned_page_stream_from_column_start<R: AsyncRead + Unpin + Send>(
reader: R,
scratch: Vec<u8>,
pages_filter: PageFilter,
max_header_size: usize,
max_page_size: usize,
) -> Result<impl Stream<Item = Result<CompressedPage>>> {
let page_metadata: PageMetaData = column_metadata.into();
Ok(_get_owned_page_stream(
Expand All @@ -66,7 +66,7 @@ pub fn get_owned_page_stream_from_column_start<R: AsyncRead + Unpin + Send>(
page_metadata.descriptor,
scratch,
pages_filter,
max_header_size,
max_page_size,
))
}

Expand Down
Loading