This is an automated email from the ASF dual-hosted git repository.
alamb pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/datafusion.git
The following commit(s) were added to refs/heads/main by this push:
new 1ffe0535ad Replacing pattern matching through downcast with trait
method (#11257)
1ffe0535ad is described below
commit 1ffe0535ad2379033d100a272ad0f968ba26aa3b
Author: Edmondo Porcu <[email protected]>
AuthorDate: Wed Jul 3 17:12:03 2024 -0400
Replacing pattern matching through downcast with trait method (#11257)
---
datafusion/physical-expr-common/src/aggregate/mod.rs | 11 +++++++++++
datafusion/physical-expr/src/aggregate/min_max.rs | 8 ++++++++
datafusion/physical-plan/src/aggregates/mod.rs | 10 ++--------
3 files changed, 21 insertions(+), 8 deletions(-)
diff --git a/datafusion/physical-expr-common/src/aggregate/mod.rs
b/datafusion/physical-expr-common/src/aggregate/mod.rs
index 336e28b4d2..cd309b7f7d 100644
--- a/datafusion/physical-expr-common/src/aggregate/mod.rs
+++ b/datafusion/physical-expr-common/src/aggregate/mod.rs
@@ -221,6 +221,17 @@ pub trait AggregateExpr: Send + Sync + Debug +
PartialEq<dyn Any> {
) -> Option<Arc<dyn AggregateExpr>> {
None
}
+
+ /// If this function is max, return (output_field, true)
+ /// if the function is min, return (output_field, false)
+ /// otherwise return None (the default)
+ ///
+ /// output_field is the name of the column produced by this aggregate
+ ///
+ /// Note: this is used to use special aggregate implementations in certain
conditions
+ fn get_minmax_desc(&self) -> Option<(Field, bool)> {
+ None
+ }
}
/// Stores the physical expressions used inside the `AggregateExpr`.
diff --git a/datafusion/physical-expr/src/aggregate/min_max.rs
b/datafusion/physical-expr/src/aggregate/min_max.rs
index 8d07f0df07..d142f68e41 100644
--- a/datafusion/physical-expr/src/aggregate/min_max.rs
+++ b/datafusion/physical-expr/src/aggregate/min_max.rs
@@ -266,6 +266,10 @@ impl AggregateExpr for Max {
fn create_sliding_accumulator(&self) -> Result<Box<dyn Accumulator>> {
Ok(Box::new(SlidingMaxAccumulator::try_new(&self.data_type)?))
}
+
+ fn get_minmax_desc(&self) -> Option<(Field, bool)> {
+ Some((self.field().ok()?, true))
+ }
}
impl PartialEq<dyn Any> for Max {
@@ -1018,6 +1022,10 @@ impl AggregateExpr for Min {
fn create_sliding_accumulator(&self) -> Result<Box<dyn Accumulator>> {
Ok(Box::new(SlidingMinAccumulator::try_new(&self.data_type)?))
}
+
+ fn get_minmax_desc(&self) -> Option<(Field, bool)> {
+ Some((self.field().ok()?, false))
+ }
}
impl PartialEq<dyn Any> for Min {
diff --git a/datafusion/physical-plan/src/aggregates/mod.rs
b/datafusion/physical-plan/src/aggregates/mod.rs
index 2bf32e8d70..258f4140bc 100644
--- a/datafusion/physical-plan/src/aggregates/mod.rs
+++ b/datafusion/physical-plan/src/aggregates/mod.rs
@@ -41,7 +41,7 @@ use datafusion_execution::TaskContext;
use datafusion_expr::Accumulator;
use datafusion_physical_expr::{
equivalence::{collapse_lex_req, ProjectionMapping},
- expressions::{Column, Max, Min, UnKnownColumn},
+ expressions::{Column, UnKnownColumn},
physical_exprs_contains, AggregateExpr, EquivalenceProperties, LexOrdering,
LexRequirement, PhysicalExpr, PhysicalSortRequirement,
};
@@ -484,13 +484,7 @@ impl AggregateExec {
/// Finds the DataType and SortDirection for this Aggregate, if there is
one
pub fn get_minmax_desc(&self) -> Option<(Field, bool)> {
let agg_expr = self.aggr_expr.iter().exactly_one().ok()?;
- if let Some(max) = agg_expr.as_any().downcast_ref::<Max>() {
- Some((max.field().ok()?, true))
- } else if let Some(min) = agg_expr.as_any().downcast_ref::<Min>() {
- Some((min.field().ok()?, false))
- } else {
- None
- }
+ agg_expr.get_minmax_desc()
}
/// true, if this Aggregate has a group-by with no required or explicit
ordering,
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
