-
Notifications
You must be signed in to change notification settings - Fork 797
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
Add Parquet RowFilter API #2335
Changes from 8 commits
43b96aa
7037126
fd73b2c
8a70d24
ebd85b3
3f3e200
6f196c0
623587d
16c0c0e
8760447
acb44f8
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 |
---|---|---|
|
@@ -100,7 +100,7 @@ pub trait ArrayReader: Send { | |
/// A collection of row groups | ||
pub trait RowGroupCollection { | ||
/// Get schema of parquet file. | ||
fn schema(&self) -> Result<SchemaDescPtr>; | ||
fn schema(&self) -> SchemaDescPtr; | ||
|
||
/// Get the numer of rows in this collection | ||
fn num_rows(&self) -> usize; | ||
|
@@ -110,8 +110,8 @@ pub trait RowGroupCollection { | |
} | ||
|
||
impl RowGroupCollection for Arc<dyn FileReader> { | ||
fn schema(&self) -> Result<SchemaDescPtr> { | ||
Ok(self.metadata().file_metadata().schema_descr_ptr()) | ||
fn schema(&self) -> SchemaDescPtr { | ||
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. Drive by cleanup |
||
self.metadata().file_metadata().schema_descr_ptr() | ||
} | ||
|
||
fn num_rows(&self) -> usize { | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,110 @@ | ||
// Licensed to the Apache Software Foundation (ASF) under one | ||
// or more contributor license agreements. See the NOTICE file | ||
// distributed with this work for additional information | ||
// regarding copyright ownership. The ASF licenses this file | ||
// to you under the Apache License, Version 2.0 (the | ||
// "License"); you may not use this file except in compliance | ||
// with the License. You may obtain a copy of the License at | ||
// | ||
// http://www.apache.org/licenses/LICENSE-2.0 | ||
// | ||
// Unless required by applicable law or agreed to in writing, | ||
// software distributed under the License is distributed on an | ||
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
// KIND, either express or implied. See the License for the | ||
// specific language governing permissions and limitations | ||
// under the License. | ||
|
||
use crate::arrow::ProjectionMask; | ||
use arrow::array::BooleanArray; | ||
use arrow::error::Result as ArrowResult; | ||
use arrow::record_batch::RecordBatch; | ||
|
||
/// A predicate operating on [`RecordBatch`] | ||
pub trait ArrowPredicate: Send + 'static { | ||
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 is to make things more extensible in the long run |
||
/// Returns the [`ProjectionMask`] that describes the columns required | ||
/// to evaluate this predicate. All projected columns will be provided in the `batch` | ||
/// passed to [`filter`](Self::filter) | ||
fn projection(&self) -> &ProjectionMask; | ||
|
||
/// Called with a [`RecordBatch`] containing the columns identified by [`Self::projection`], | ||
/// with `true` values in the returned [`BooleanArray`] indicating rows | ||
/// matching the predicate. | ||
/// | ||
/// All row that are `true` in returned [`BooleanArray`] will be returned to the reader. | ||
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. minor typo: |
||
/// Any rows that are `false` or `Null` will not be | ||
fn filter(&mut self, batch: RecordBatch) -> ArrowResult<BooleanArray>; | ||
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. should this be named 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 think both names are kind of confusing tbh, I'll rename it to |
||
} | ||
|
||
/// An [`ArrowPredicate`] created from an [`FnMut`] | ||
pub struct ArrowPredicateFn<F> { | ||
f: F, | ||
projection: ProjectionMask, | ||
} | ||
|
||
impl<F> ArrowPredicateFn<F> | ||
where | ||
F: FnMut(RecordBatch) -> ArrowResult<BooleanArray> + Send + 'static, | ||
{ | ||
/// Create a new [`ArrowPredicateFn`]. `f` will be passed batches | ||
/// that contains the columns specified in `projection` | ||
/// and returns a [`BooleanArray`] that describes which rows should | ||
/// be passed along | ||
pub fn new(projection: ProjectionMask, f: F) -> Self { | ||
Self { f, projection } | ||
} | ||
} | ||
|
||
impl<F> ArrowPredicate for ArrowPredicateFn<F> | ||
where | ||
F: FnMut(RecordBatch) -> ArrowResult<BooleanArray> + Send + 'static, | ||
{ | ||
fn projection(&self) -> &ProjectionMask { | ||
&self.projection | ||
} | ||
|
||
fn filter(&mut self, batch: RecordBatch) -> ArrowResult<BooleanArray> { | ||
(self.f)(batch) | ||
} | ||
} | ||
|
||
/// A [`RowFilter`] allows pushing down a filter predicate to skip IO and decode | ||
/// | ||
/// This consists of a list of [`ArrowPredicate`] where only the rows that satisfy all | ||
/// of the predicates will be returned. Any [`RowSelection`] will be applied prior | ||
/// to the first predicate, and each predicate in turn will then be used to compute | ||
/// a more refined [`RowSelection`] to use when evaluating the subsequent predicates. | ||
/// | ||
/// Once all predicates have been evaluated, the final [`RowSelection`] is applied | ||
/// to the top-level [`ProjectionMask`] to produce the final output [`RecordBatch`]. | ||
/// | ||
/// This design has a couple of implications: | ||
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 is the major change vs #2310, FYI @thinkharderdev 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. Nice, I like this |
||
/// | ||
/// * [`RowFilter`] can be used to skip entire pages, and thus IO, in addition to CPU decode overheads | ||
/// * Columns may be decoded multiple times if they appear in multiple [`ProjectionMask`] | ||
/// * IO will be deferred until needed by a [`ProjectionMask`] | ||
/// | ||
/// As such there is a trade-off between a single large predicate, or multiple predicates, | ||
/// that will depend on the shape of the data. Whilst multiple smaller predicates may | ||
/// minimise the amount of data scanned/decoded, it may not be faster overall. | ||
/// | ||
tustvold marked this conversation as resolved.
Show resolved
Hide resolved
|
||
/// For example, if a predicate that needs a single column of data filters out all but | ||
/// 1% of the rows, applying it as one of the early `ArrowPredicateFn` will likely significantly | ||
/// improve performance. | ||
/// | ||
/// As a counter example, if a predicate needs several columns of data to evaluate but | ||
/// leaves 99% of the rows, it may be better to not filter the data from parquet and | ||
/// apply the filter after the RecordBatch has been fully decoded. | ||
/// | ||
/// [`RowSelection`]: [super::selection::RowSelection] | ||
pub struct RowFilter { | ||
/// A list of [`ArrowPredicate`] | ||
pub(crate) predicates: Vec<Box<dyn ArrowPredicate>>, | ||
} | ||
|
||
impl RowFilter { | ||
/// Create a new [`RowFilter`] from an array of [`ArrowPredicate`] | ||
pub fn new(predicates: Vec<Box<dyn ArrowPredicate>>) -> Self { | ||
Self { predicates } | ||
} | ||
} |
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.
Drive by cleanup