You are viewing a plain text version of this content. The canonical link for it is here.
Posted to github@arrow.apache.org by "alamb (via GitHub)" <gi...@apache.org> on 2023/07/28 19:01:58 UTC
[GitHub] [arrow-datafusion] alamb commented on a diff in pull request #7127: Minor: move `AnalysisContext` out of physical_expr and into its own module
alamb commented on code in PR #7127:
URL: https://github.com/apache/arrow-datafusion/pull/7127#discussion_r1277688166
##########
datafusion/physical-expr/src/analysis.rs:
##########
@@ -0,0 +1,241 @@
+// 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.
+
+//! Interval and selectivity in [`AnalysisContext`]
+
+use crate::expressions::Column;
+use crate::intervals::cp_solver::PropagationResult;
+use crate::intervals::{cardinality_ratio, ExprIntervalGraph, Interval, IntervalBound};
+use crate::utils::collect_columns;
+use crate::PhysicalExpr;
+
+use arrow::datatypes::Schema;
+use datafusion_common::{ColumnStatistics, DataFusionError, Result, ScalarValue};
+
+use std::fmt::Debug;
+use std::sync::Arc;
+
+/// The shared context used during the analysis of an expression. Includes
+/// the boundaries for all known columns.
+#[derive(Clone, Debug, PartialEq)]
+pub struct AnalysisContext {
Review Comment:
this is all code moved from `physical_expr`
##########
datafusion/physical-expr/src/physical_expr.rs:
##########
@@ -386,136 +173,3 @@ pub fn down_cast_any_ref(any: &dyn Any) -> &dyn Any {
any
}
}
-
-/// Scatter `truthy` array by boolean mask. When the mask evaluates `true`, next values of `truthy`
-/// are taken, when the mask evaluates `false` values null values are filled.
-///
-/// # Arguments
-/// * `mask` - Boolean values used to determine where to put the `truthy` values
-/// * `truthy` - All values of this array are to scatter according to `mask` into final result.
-fn scatter(mask: &BooleanArray, truthy: &dyn Array) -> Result<ArrayRef> {
- let truthy = truthy.to_data();
-
- // update the mask so that any null values become false
- // (SlicesIterator doesn't respect nulls)
- let mask = and_kleene(mask, &is_not_null(mask)?)?;
-
- let mut mutable = MutableArrayData::new(vec![&truthy], true, mask.len());
-
- // the SlicesIterator slices only the true values. So the gaps left by this iterator we need to
- // fill with falsy values
-
- // keep track of how much is filled
- let mut filled = 0;
- // keep track of current position we have in truthy array
- let mut true_pos = 0;
-
- SlicesIterator::new(&mask).for_each(|(start, end)| {
- // the gap needs to be filled with nulls
- if start > filled {
- mutable.extend_nulls(start - filled);
- }
- // fill with truthy values
- let len = end - start;
- mutable.extend(0, true_pos, true_pos + len);
- true_pos += len;
- filled = end;
- });
- // the remaining part is falsy
- if filled < mask.len() {
- mutable.extend_nulls(mask.len() - filled);
- }
-
- let data = mutable.freeze();
- Ok(make_array(data))
-}
-
-#[macro_export]
-// If the given expression is None, return the given context
-// without setting the boundaries.
-macro_rules! analysis_expect {
- ($context: ident, $expr: expr) => {
- match $expr {
- Some(expr) => expr,
- None => return Ok($context.with_boundaries(None)),
- }
- };
-}
-
-#[cfg(test)]
Review Comment:
moved to utils
##########
datafusion/physical-expr/src/physical_expr.rs:
##########
@@ -386,136 +173,3 @@ pub fn down_cast_any_ref(any: &dyn Any) -> &dyn Any {
any
}
}
-
-/// Scatter `truthy` array by boolean mask. When the mask evaluates `true`, next values of `truthy`
-/// are taken, when the mask evaluates `false` values null values are filled.
-///
-/// # Arguments
-/// * `mask` - Boolean values used to determine where to put the `truthy` values
-/// * `truthy` - All values of this array are to scatter according to `mask` into final result.
-fn scatter(mask: &BooleanArray, truthy: &dyn Array) -> Result<ArrayRef> {
- let truthy = truthy.to_data();
-
- // update the mask so that any null values become false
- // (SlicesIterator doesn't respect nulls)
- let mask = and_kleene(mask, &is_not_null(mask)?)?;
-
- let mut mutable = MutableArrayData::new(vec![&truthy], true, mask.len());
-
- // the SlicesIterator slices only the true values. So the gaps left by this iterator we need to
- // fill with falsy values
-
- // keep track of how much is filled
- let mut filled = 0;
- // keep track of current position we have in truthy array
- let mut true_pos = 0;
-
- SlicesIterator::new(&mask).for_each(|(start, end)| {
- // the gap needs to be filled with nulls
- if start > filled {
- mutable.extend_nulls(start - filled);
- }
- // fill with truthy values
- let len = end - start;
- mutable.extend(0, true_pos, true_pos + len);
- true_pos += len;
- filled = end;
- });
- // the remaining part is falsy
- if filled < mask.len() {
- mutable.extend_nulls(mask.len() - filled);
- }
-
- let data = mutable.freeze();
- Ok(make_array(data))
-}
-
-#[macro_export]
Review Comment:
this macro was unused from what I can tell
--
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: github-unsubscribe@arrow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org