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.

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

Replace filter_row_groups with ReadOptions in parquet SerializedFileReader #1389

Merged
merged 7 commits into from
Mar 6, 2022
Merged
Changes from 1 commit
Commits
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
72 changes: 66 additions & 6 deletions parquet/src/file/serialized_reader.rs
Original file line number Diff line number Diff line change
Expand Up @@ -138,25 +138,51 @@ impl<R: 'static + ChunkReader> SerializedFileReader<R> {
})
}

/// Filters row group metadata to only those row groups,
/// for which the predicate function returns true
/// Filter row groups by metadata that match the predicate criteria and row group's midpoint
/// are within the `[start, end)` range (if the range is provided).
pub fn filter_row_groups(
&mut self,
predicate: &dyn Fn(&RowGroupMetaData, usize) -> bool,
range: Option<(i64, i64)>,
yjshen marked this conversation as resolved.
Show resolved Hide resolved
) {
let mut filtered_row_groups = Vec::<RowGroupMetaData>::new();
for (i, row_group_metadata) in self.metadata.row_groups().iter().enumerate() {
if predicate(row_group_metadata, i) {
filtered_row_groups.push(row_group_metadata.clone());
if let Some(range) = range {
for (i, row_group_metadata) in self.metadata.row_groups().iter().enumerate() {
let mid = get_midpoint_offset(row_group_metadata);
if mid >= range.1 {
break;
}
if mid >= range.0 && predicate(row_group_metadata, i) {
filtered_row_groups.push(row_group_metadata.clone());
}
}
} else {
for (i, row_group_metadata) in self.metadata.row_groups().iter().enumerate() {
if predicate(row_group_metadata, i) {
filtered_row_groups.push(row_group_metadata.clone());
}
}
}

self.metadata = ParquetMetaData::new(
self.metadata.file_metadata().clone(),
filtered_row_groups,
);
}
}

/// Get midpoint offset for a row group
fn get_midpoint_offset(meta: &RowGroupMetaData) -> i64 {
let col = meta.column(0);
let mut offset = col.data_page_offset();
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For encrypted Parquet files we'll need to use file_offset but it's fine for now since it's not supported anyways.

if let Some(dic_offset) = col.dictionary_page_offset() {
if offset > dic_offset {
offset = dic_offset
}
};
offset + meta.compressed_size() / 2
}

impl<R: 'static + ChunkReader> FileReader for SerializedFileReader<R> {
fn metadata(&self) -> &ParquetMetaData {
&self.metadata
Expand Down Expand Up @@ -801,7 +827,41 @@ mod tests {
assert_eq!(metadata.num_row_groups(), 1);

// test filtering out all row groups
reader.filter_row_groups(&|_, _| false);
reader.filter_row_groups(&|_, _| false, None);
let metadata = reader.metadata();
assert_eq!(metadata.num_row_groups(), 0);

Ok(())
}

#[test]
fn test_file_reader_filter_row_groups_by_including_range() -> Result<()> {
let test_file = get_test_file("alltypes_plain.parquet");
let mut reader = SerializedFileReader::new(test_file)?;

// test initial number of row groups
let metadata = reader.metadata();
assert_eq!(metadata.num_row_groups(), 1);

let mid = get_midpoint_offset(metadata.row_group(0));
reader.filter_row_groups(&|_, _| true, Some((0, mid + 1)));
let metadata = reader.metadata();
assert_eq!(metadata.num_row_groups(), 1);

Ok(())
}

#[test]
fn test_file_reader_filter_row_groups_by_non_including_range() -> Result<()> {
let test_file = get_test_file("alltypes_plain.parquet");
let mut reader = SerializedFileReader::new(test_file)?;

// test initial number of row groups
let metadata = reader.metadata();
assert_eq!(metadata.num_row_groups(), 1);

let mid = get_midpoint_offset(metadata.row_group(0));
reader.filter_row_groups(&|_, _| true, Some((0, mid)));
let metadata = reader.metadata();
assert_eq!(metadata.num_row_groups(), 0);

Expand Down