Skip to content
Merged
Changes from all commits
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
26 changes: 11 additions & 15 deletions crates/iceberg/src/expr/visitors/manifest_evaluator.rs
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ impl BoundPredicateVisitor for ManifestFilterVisitor<'_> {
Some(bound_bytes) => {
let bound = ManifestFilterVisitor::bytes_to_datum(
bound_bytes,
*reference.field().field_type.clone(),
&reference.field().field_type,
);
if datum <= &bound {
ROWS_CANNOT_MATCH
Expand All @@ -212,7 +212,7 @@ impl BoundPredicateVisitor for ManifestFilterVisitor<'_> {
Some(bound_bytes) => {
let bound = ManifestFilterVisitor::bytes_to_datum(
bound_bytes,
*reference.field().field_type.clone(),
&reference.field().field_type,
);
if datum < &bound {
ROWS_CANNOT_MATCH
Expand All @@ -235,7 +235,7 @@ impl BoundPredicateVisitor for ManifestFilterVisitor<'_> {
Some(bound_bytes) => {
let bound = ManifestFilterVisitor::bytes_to_datum(
bound_bytes,
*reference.field().field_type.clone(),
&reference.field().field_type,
);
if datum >= &bound {
ROWS_CANNOT_MATCH
Expand All @@ -258,7 +258,7 @@ impl BoundPredicateVisitor for ManifestFilterVisitor<'_> {
Some(bound_bytes) => {
let bound = ManifestFilterVisitor::bytes_to_datum(
bound_bytes,
*reference.field().field_type.clone(),
&reference.field().field_type,
);
if datum > &bound {
ROWS_CANNOT_MATCH
Expand All @@ -285,7 +285,7 @@ impl BoundPredicateVisitor for ManifestFilterVisitor<'_> {
if let Some(lower_bound_bytes) = &field.lower_bound {
let lower_bound = ManifestFilterVisitor::bytes_to_datum(
lower_bound_bytes,
*reference.field().field_type.clone(),
&reference.field().field_type,
);
if &lower_bound > datum {
return ROWS_CANNOT_MATCH;
Expand All @@ -295,7 +295,7 @@ impl BoundPredicateVisitor for ManifestFilterVisitor<'_> {
if let Some(upper_bound_bytes) = &field.upper_bound {
let upper_bound = ManifestFilterVisitor::bytes_to_datum(
upper_bound_bytes,
*reference.field().field_type.clone(),
&reference.field().field_type,
);
if &upper_bound < datum {
return ROWS_CANNOT_MATCH;
Expand Down Expand Up @@ -410,20 +410,16 @@ impl BoundPredicateVisitor for ManifestFilterVisitor<'_> {
}

if let Some(lower_bound) = &field.lower_bound {
let lower_bound = ManifestFilterVisitor::bytes_to_datum(
lower_bound,
*reference.field().clone().field_type,
);
let lower_bound =
ManifestFilterVisitor::bytes_to_datum(lower_bound, &reference.field().field_type);
if literals.iter().all(|datum| &lower_bound > datum) {
return ROWS_CANNOT_MATCH;
}
}

if let Some(upper_bound) = &field.upper_bound {
let upper_bound = ManifestFilterVisitor::bytes_to_datum(
upper_bound,
*reference.field().clone().field_type,
);
let upper_bound =
ManifestFilterVisitor::bytes_to_datum(upper_bound, &reference.field().field_type);
if literals.iter().all(|datum| &upper_bound < datum) {
return ROWS_CANNOT_MATCH;
}
Expand Down Expand Up @@ -474,7 +470,7 @@ impl ManifestFilterVisitor<'_> {
Ok(bound)
}

fn bytes_to_datum(bytes: &ByteBuf, t: Type) -> Datum {
fn bytes_to_datum(bytes: &ByteBuf, t: &Type) -> Datum {
let p = t.as_primitive_type().unwrap();
Datum::try_from_bytes(bytes, p.clone()).unwrap()
}
Expand Down
Loading