marvinlanhenke commented on code in PR #322: URL: https://github.com/apache/iceberg-rust/pull/322#discussion_r1572246030
########## crates/iceberg/src/expr/visitors/manifest_evaluator.rs: ########## @@ -0,0 +1,393 @@ +// 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::expr::visitors::bound_predicate_visitor::{visit, BoundPredicateVisitor}; +use crate::expr::visitors::inclusive_projection::InclusiveProjection; +use crate::expr::{Bind, BoundPredicate, BoundReference}; +use crate::spec::{Datum, FieldSummary, ManifestFile, PartitionSpecRef, Schema, SchemaRef}; +use fnv::FnvHashSet; +use std::sync::Arc; + +/// Evaluates [`ManifestFile`]s to see if their partition summary matches a provided +/// [`BoundPredicate`]. Used by [`TableScan`] to filter down the list of [`ManifestFile`]s +/// in which data might be found that matches the TableScan's filter. +pub(crate) struct ManifestEvaluator { + partition_schema: SchemaRef, + partition_filter: BoundPredicate, + case_sensitive: bool, +} + +impl ManifestEvaluator { + pub(crate) fn new( + partition_spec: PartitionSpecRef, + table_schema: SchemaRef, + partition_filter: BoundPredicate, + case_sensitive: bool, + ) -> crate::Result<Self> { + let partition_type = partition_spec.partition_type(&table_schema)?; + + // this is needed as SchemaBuilder.with_fields expects an iterator over + // Arc<NestedField> rather than &Arc<NestedField> + let cloned_partition_fields: Vec<_> = + partition_type.fields().iter().map(Arc::clone).collect(); + + let partition_schema = Schema::builder() + .with_fields(cloned_partition_fields) + .build()?; + + let partition_schema_ref = Arc::new(partition_schema); + + let mut inclusive_projection = InclusiveProjection::new(partition_spec.clone()); + let unbound_partition_filter = inclusive_projection.project(&partition_filter)?; + + let partition_filter = + unbound_partition_filter.bind(partition_schema_ref.clone(), case_sensitive)?; + + Ok(Self { + partition_schema: partition_schema_ref, + partition_filter, + case_sensitive, + }) + } + + /// Evaluate this `ManifestEvaluator`'s filter predicate against the + /// provided [`ManifestFile`]'s partitions. Used by [`TableScan`] to + /// see if this `ManifestFile` could possibly contain data that matches + /// the scan's filter. + pub(crate) fn eval(&self, manifest_file: &ManifestFile) -> crate::Result<bool> { + if manifest_file.partitions.is_empty() { + return Ok(true); + } + + struct ManifestFilterVisitor<'a> { Review Comment: nit: although ManifestFilterVisitor is probably only used in `eval`, do we really want to nest it inside the fn? Personally I find it somewhat harder to read - but this is just my personal view. Perhaps others can comment as well? ########## crates/iceberg/src/expr/visitors/manifest_evaluator.rs: ########## @@ -0,0 +1,393 @@ +// 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::expr::visitors::bound_predicate_visitor::{visit, BoundPredicateVisitor}; +use crate::expr::visitors::inclusive_projection::InclusiveProjection; +use crate::expr::{Bind, BoundPredicate, BoundReference}; +use crate::spec::{Datum, FieldSummary, ManifestFile, PartitionSpecRef, Schema, SchemaRef}; +use fnv::FnvHashSet; +use std::sync::Arc; + +/// Evaluates [`ManifestFile`]s to see if their partition summary matches a provided +/// [`BoundPredicate`]. Used by [`TableScan`] to filter down the list of [`ManifestFile`]s +/// in which data might be found that matches the TableScan's filter. +pub(crate) struct ManifestEvaluator { + partition_schema: SchemaRef, + partition_filter: BoundPredicate, + case_sensitive: bool, +} + +impl ManifestEvaluator { + pub(crate) fn new( + partition_spec: PartitionSpecRef, + table_schema: SchemaRef, + partition_filter: BoundPredicate, + case_sensitive: bool, + ) -> crate::Result<Self> { + let partition_type = partition_spec.partition_type(&table_schema)?; + + // this is needed as SchemaBuilder.with_fields expects an iterator over + // Arc<NestedField> rather than &Arc<NestedField> + let cloned_partition_fields: Vec<_> = + partition_type.fields().iter().map(Arc::clone).collect(); + + let partition_schema = Schema::builder() + .with_fields(cloned_partition_fields) + .build()?; + + let partition_schema_ref = Arc::new(partition_schema); + + let mut inclusive_projection = InclusiveProjection::new(partition_spec.clone()); + let unbound_partition_filter = inclusive_projection.project(&partition_filter)?; + + let partition_filter = + unbound_partition_filter.bind(partition_schema_ref.clone(), case_sensitive)?; Review Comment: in the python impl `rewrite_not` is also applied: https://github.com/apache/iceberg-python/blob/main/pyiceberg/expressions/visitors.py#L555 ...however, I'm not sure if at this point our ExprTree could even contain any NOT nodes? -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: issues-unsubscr...@iceberg.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org --------------------------------------------------------------------- To unsubscribe, e-mail: issues-unsubscr...@iceberg.apache.org For additional commands, e-mail: issues-h...@iceberg.apache.org
