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

Jump to bottom

simplify code #2

Closed
wants to merge 1 commit into from
Closed

simplify code #2

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
29 changes: 10 additions & 19 deletions datafusion/functions-aggregate/src/min_max.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -955,19 +955,16 @@ impl AggregateUDFImpl for Min {
}

fn return_type(&self, arg_types: &[DataType]) -> Result<DataType> {
type_coercion::aggregates::get_min_max_result_type(arg_types)?
.into_iter()
.next()
.ok_or_else(|| {
DataFusionError::Internal(
"Expected at one input type for MIN aggregate function".to_string(),
)
})
Ok(arg_types[0].to_owned())
}

fn coerce_types(&self, arg_types: &[DataType]) -> Result<Vec<DataType>> {
let data_type = min_max_aggregate_data_type(&arg_types[0]);
Ok(vec![data_type.to_owned()])
}

fn accumulator(&self, acc_args: AccumulatorArgs) -> Result<Box<dyn Accumulator>> {
let data_type = min_max_aggregate_data_type(acc_args.data_type);
Ok(Box::new(MinAccumulator::try_new(data_type)?))
Ok(Box::new(MinAccumulator::try_new(acc_args.data_type)?))
}

fn aliases(&self) -> &[String] {
Expand All @@ -976,9 +973,8 @@ impl AggregateUDFImpl for Min {

fn groups_accumulator_supported(&self, args: AccumulatorArgs) -> bool {
use DataType::*;
let data_type = min_max_aggregate_data_type(args.data_type);
matches!(
data_type,
args.data_type,
Int8 | Int16
| Int32
| Int64
Expand All @@ -1004,7 +1000,7 @@ impl AggregateUDFImpl for Min {
) -> Result<Box<dyn GroupsAccumulator>> {
use DataType::*;
use TimeUnit::*;
let data_type = min_max_aggregate_data_type(args.data_type);
let data_type = args.data_type;
match data_type {
Int8 => instantiate_min_accumulator!(data_type, i8, Int8Type),
Int16 => instantiate_min_accumulator!(data_type, i16, Int16Type),
Expand Down Expand Up @@ -1065,8 +1061,7 @@ impl AggregateUDFImpl for Min {
&self,
args: AccumulatorArgs,
) -> Result<Box<dyn Accumulator>> {
let data_type = min_max_aggregate_data_type(args.data_type);
Ok(Box::new(SlidingMinAccumulator::try_new(data_type)?))
Ok(Box::new(SlidingMinAccumulator::try_new(args.data_type)?))
}

fn is_descending(&self) -> Option<bool> {
Expand All @@ -1077,10 +1072,6 @@ impl AggregateUDFImpl for Min {
datafusion_expr::utils::AggregateOrderSensitivity::Insensitive
}

fn coerce_types(&self, arg_types: &[DataType]) -> Result<Vec<DataType>> {
type_coercion::aggregates::get_min_max_result_type(arg_types)
}

fn reverse_expr(&self) -> datafusion_expr::ReversedUDAF {
datafusion_expr::ReversedUDAF::Identical
}
Expand Down