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

fix: Remove duplicate filter #414

Merged
merged 1 commit into from
Jun 20, 2024
Merged

fix: Remove duplicate filter #414

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
30 changes: 11 additions & 19 deletions crates/iceberg/src/scan.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ pub struct TableScanBuilder<'a> {
table: &'a Table,
// Empty column names means to select all columns
column_names: Vec<String>,
predicates: Option<Predicate>,
snapshot_id: Option<i64>,
batch_size: Option<usize>,
case_sensitive: bool,
Expand All @@ -61,7 +60,6 @@ impl<'a> TableScanBuilder<'a> {
Self {
table,
column_names: vec![],
predicates: None,
snapshot_id: None,
batch_size: None,
case_sensitive: true,
Expand Down Expand Up @@ -96,12 +94,6 @@ impl<'a> TableScanBuilder<'a> {
self
}

/// Add a predicate to the scan. The scan will only return rows that match the predicate.
pub fn filter(mut self, predicate: Predicate) -> Self {
self.predicates = Some(predicate);
self
}

/// Select some columns of the table.
pub fn select(mut self, column_names: impl IntoIterator<Item = impl ToString>) -> Self {
self.column_names = column_names
Expand Down Expand Up @@ -161,7 +153,7 @@ impl<'a> TableScanBuilder<'a> {
}
}

let bound_predicates = if let Some(ref predicates) = self.predicates {
let bound_predicates = if let Some(ref predicates) = self.filter {
Some(predicates.bind(schema.clone(), true)?)
} else {
None
Expand Down Expand Up @@ -904,7 +896,7 @@ mod tests {
// Filter: y < 3
let mut builder = fixture.table.scan();
let predicate = Reference::new("y").less_than(Datum::long(3));
builder = builder.filter(predicate);
builder = builder.with_filter(predicate);
let table_scan = builder.build().unwrap();

let batch_stream = table_scan.to_arrow().await.unwrap();
Expand All @@ -930,7 +922,7 @@ mod tests {
// Filter: y >= 5
let mut builder = fixture.table.scan();
let predicate = Reference::new("y").greater_than_or_equal_to(Datum::long(5));
builder = builder.filter(predicate);
builder = builder.with_filter(predicate);
let table_scan = builder.build().unwrap();

let batch_stream = table_scan.to_arrow().await.unwrap();
Expand All @@ -956,7 +948,7 @@ mod tests {
// Filter: y is null
let mut builder = fixture.table.scan();
let predicate = Reference::new("y").is_null();
builder = builder.filter(predicate);
builder = builder.with_filter(predicate);
let table_scan = builder.build().unwrap();

let batch_stream = table_scan.to_arrow().await.unwrap();
Expand All @@ -973,7 +965,7 @@ mod tests {
// Filter: y is not null
let mut builder = fixture.table.scan();
let predicate = Reference::new("y").is_not_null();
builder = builder.filter(predicate);
builder = builder.with_filter(predicate);
let table_scan = builder.build().unwrap();

let batch_stream = table_scan.to_arrow().await.unwrap();
Expand All @@ -992,7 +984,7 @@ mod tests {
let predicate = Reference::new("y")
.less_than(Datum::long(5))
.and(Reference::new("z").greater_than_or_equal_to(Datum::long(4)));
builder = builder.filter(predicate);
builder = builder.with_filter(predicate);
let table_scan = builder.build().unwrap();

let batch_stream = table_scan.to_arrow().await.unwrap();
Expand Down Expand Up @@ -1026,7 +1018,7 @@ mod tests {
let predicate = Reference::new("y")
.less_than(Datum::long(5))
.or(Reference::new("z").greater_than_or_equal_to(Datum::long(4)));
builder = builder.filter(predicate);
builder = builder.with_filter(predicate);
let table_scan = builder.build().unwrap();

let batch_stream = table_scan.to_arrow().await.unwrap();
Expand Down Expand Up @@ -1061,7 +1053,7 @@ mod tests {
// Filter: a STARTSWITH "Ice"
let mut builder = fixture.table.scan();
let predicate = Reference::new("a").starts_with(Datum::string("Ice"));
builder = builder.filter(predicate);
builder = builder.with_filter(predicate);
let table_scan = builder.build().unwrap();

let batch_stream = table_scan.to_arrow().await.unwrap();
Expand All @@ -1083,7 +1075,7 @@ mod tests {
// Filter: a NOT STARTSWITH "Ice"
let mut builder = fixture.table.scan();
let predicate = Reference::new("a").not_starts_with(Datum::string("Ice"));
builder = builder.filter(predicate);
builder = builder.with_filter(predicate);
let table_scan = builder.build().unwrap();

let batch_stream = table_scan.to_arrow().await.unwrap();
Expand All @@ -1106,7 +1098,7 @@ mod tests {
let mut builder = fixture.table.scan();
let predicate =
Reference::new("a").is_in([Datum::string("Sioux"), Datum::string("Iceberg")]);
builder = builder.filter(predicate);
builder = builder.with_filter(predicate);
let table_scan = builder.build().unwrap();

let batch_stream = table_scan.to_arrow().await.unwrap();
Expand All @@ -1129,7 +1121,7 @@ mod tests {
let mut builder = fixture.table.scan();
let predicate =
Reference::new("a").is_not_in([Datum::string("Sioux"), Datum::string("Iceberg")]);
builder = builder.filter(predicate);
builder = builder.with_filter(predicate);
let table_scan = builder.build().unwrap();

let batch_stream = table_scan.to_arrow().await.unwrap();
Expand Down
Loading