Skip to content
Merged
Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions datafusion/functions-aggregate/src/approx_percentile_cont.rs
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ impl ApproxPercentileCont {

pub(crate) fn create_accumulator(
&self,
args: AccumulatorArgs,
args: &AccumulatorArgs,
) -> Result<ApproxPercentileAccumulator> {
let percentile =
validate_percentile_expr(&args.exprs[1], "APPROX_PERCENTILE_CONT")?;
Expand Down Expand Up @@ -300,7 +300,7 @@ impl AggregateUDFImpl for ApproxPercentileCont {

#[inline]
fn accumulator(&self, acc_args: AccumulatorArgs) -> Result<Box<dyn Accumulator>> {
Ok(Box::new(self.create_accumulator(acc_args)?))
Ok(Box::new(self.create_accumulator(&acc_args)?))
}

fn return_type(&self, arg_types: &[DataType]) -> Result<DataType> {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ impl AggregateUDFImpl for ApproxPercentileContWithWeight {
is_distinct: acc_args.is_distinct,
};
let approx_percentile_cont_accumulator =
self.approx_percentile_cont.create_accumulator(sub_args)?;
self.approx_percentile_cont.create_accumulator(&sub_args)?;
let accumulator = ApproxPercentileWithWeightAccumulator::new(
approx_percentile_cont_accumulator,
);
Expand Down
108 changes: 54 additions & 54 deletions datafusion/functions-aggregate/src/first_last.rs
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ impl AggregateUDFImpl for FirstValue {
args: AccumulatorArgs,
) -> Result<Box<dyn GroupsAccumulator>> {
fn create_accumulator<T: ArrowPrimitiveType + Send>(
args: AccumulatorArgs,
args: &AccumulatorArgs,
) -> Result<Box<dyn GroupsAccumulator>> {
let Some(ordering) = LexOrdering::new(args.order_bys.to_vec()) else {
return internal_err!("Groups accumulator must have an ordering.");
Expand All @@ -231,50 +231,50 @@ impl AggregateUDFImpl for FirstValue {
}

match args.return_field.data_type() {
DataType::Int8 => create_accumulator::<Int8Type>(args),
DataType::Int16 => create_accumulator::<Int16Type>(args),
DataType::Int32 => create_accumulator::<Int32Type>(args),
DataType::Int64 => create_accumulator::<Int64Type>(args),
DataType::UInt8 => create_accumulator::<UInt8Type>(args),
DataType::UInt16 => create_accumulator::<UInt16Type>(args),
DataType::UInt32 => create_accumulator::<UInt32Type>(args),
DataType::UInt64 => create_accumulator::<UInt64Type>(args),
DataType::Float16 => create_accumulator::<Float16Type>(args),
DataType::Float32 => create_accumulator::<Float32Type>(args),
DataType::Float64 => create_accumulator::<Float64Type>(args),

DataType::Decimal32(_, _) => create_accumulator::<Decimal32Type>(args),
DataType::Decimal64(_, _) => create_accumulator::<Decimal64Type>(args),
DataType::Decimal128(_, _) => create_accumulator::<Decimal128Type>(args),
DataType::Decimal256(_, _) => create_accumulator::<Decimal256Type>(args),
DataType::Int8 => create_accumulator::<Int8Type>(&args),
DataType::Int16 => create_accumulator::<Int16Type>(&args),
DataType::Int32 => create_accumulator::<Int32Type>(&args),
DataType::Int64 => create_accumulator::<Int64Type>(&args),
DataType::UInt8 => create_accumulator::<UInt8Type>(&args),
DataType::UInt16 => create_accumulator::<UInt16Type>(&args),
DataType::UInt32 => create_accumulator::<UInt32Type>(&args),
DataType::UInt64 => create_accumulator::<UInt64Type>(&args),
DataType::Float16 => create_accumulator::<Float16Type>(&args),
DataType::Float32 => create_accumulator::<Float32Type>(&args),
DataType::Float64 => create_accumulator::<Float64Type>(&args),

DataType::Decimal32(_, _) => create_accumulator::<Decimal32Type>(&args),
DataType::Decimal64(_, _) => create_accumulator::<Decimal64Type>(&args),
DataType::Decimal128(_, _) => create_accumulator::<Decimal128Type>(&args),
DataType::Decimal256(_, _) => create_accumulator::<Decimal256Type>(&args),

DataType::Timestamp(TimeUnit::Second, _) => {
create_accumulator::<TimestampSecondType>(args)
create_accumulator::<TimestampSecondType>(&args)
}
DataType::Timestamp(TimeUnit::Millisecond, _) => {
create_accumulator::<TimestampMillisecondType>(args)
create_accumulator::<TimestampMillisecondType>(&args)
}
DataType::Timestamp(TimeUnit::Microsecond, _) => {
create_accumulator::<TimestampMicrosecondType>(args)
create_accumulator::<TimestampMicrosecondType>(&args)
}
DataType::Timestamp(TimeUnit::Nanosecond, _) => {
create_accumulator::<TimestampNanosecondType>(args)
create_accumulator::<TimestampNanosecondType>(&args)
}

DataType::Date32 => create_accumulator::<Date32Type>(args),
DataType::Date64 => create_accumulator::<Date64Type>(args),
DataType::Date32 => create_accumulator::<Date32Type>(&args),
DataType::Date64 => create_accumulator::<Date64Type>(&args),
DataType::Time32(TimeUnit::Second) => {
create_accumulator::<Time32SecondType>(args)
create_accumulator::<Time32SecondType>(&args)
}
DataType::Time32(TimeUnit::Millisecond) => {
create_accumulator::<Time32MillisecondType>(args)
create_accumulator::<Time32MillisecondType>(&args)
}

DataType::Time64(TimeUnit::Microsecond) => {
create_accumulator::<Time64MicrosecondType>(args)
create_accumulator::<Time64MicrosecondType>(&args)
}
DataType::Time64(TimeUnit::Nanosecond) => {
create_accumulator::<Time64NanosecondType>(args)
create_accumulator::<Time64NanosecondType>(&args)
}

_ => internal_err!(
Expand Down Expand Up @@ -1171,7 +1171,7 @@ impl AggregateUDFImpl for LastValue {
args: AccumulatorArgs,
) -> Result<Box<dyn GroupsAccumulator>> {
fn create_accumulator<T>(
args: AccumulatorArgs,
args: &AccumulatorArgs,
) -> Result<Box<dyn GroupsAccumulator>>
where
T: ArrowPrimitiveType + Send,
Expand All @@ -1195,50 +1195,50 @@ impl AggregateUDFImpl for LastValue {
}

match args.return_field.data_type() {
DataType::Int8 => create_accumulator::<Int8Type>(args),
DataType::Int16 => create_accumulator::<Int16Type>(args),
DataType::Int32 => create_accumulator::<Int32Type>(args),
DataType::Int64 => create_accumulator::<Int64Type>(args),
DataType::UInt8 => create_accumulator::<UInt8Type>(args),
DataType::UInt16 => create_accumulator::<UInt16Type>(args),
DataType::UInt32 => create_accumulator::<UInt32Type>(args),
DataType::UInt64 => create_accumulator::<UInt64Type>(args),
DataType::Float16 => create_accumulator::<Float16Type>(args),
DataType::Float32 => create_accumulator::<Float32Type>(args),
DataType::Float64 => create_accumulator::<Float64Type>(args),

DataType::Decimal32(_, _) => create_accumulator::<Decimal32Type>(args),
DataType::Decimal64(_, _) => create_accumulator::<Decimal64Type>(args),
DataType::Decimal128(_, _) => create_accumulator::<Decimal128Type>(args),
DataType::Decimal256(_, _) => create_accumulator::<Decimal256Type>(args),
DataType::Int8 => create_accumulator::<Int8Type>(&args),
DataType::Int16 => create_accumulator::<Int16Type>(&args),
DataType::Int32 => create_accumulator::<Int32Type>(&args),
DataType::Int64 => create_accumulator::<Int64Type>(&args),
DataType::UInt8 => create_accumulator::<UInt8Type>(&args),
DataType::UInt16 => create_accumulator::<UInt16Type>(&args),
DataType::UInt32 => create_accumulator::<UInt32Type>(&args),
DataType::UInt64 => create_accumulator::<UInt64Type>(&args),
DataType::Float16 => create_accumulator::<Float16Type>(&args),
DataType::Float32 => create_accumulator::<Float32Type>(&args),
DataType::Float64 => create_accumulator::<Float64Type>(&args),

DataType::Decimal32(_, _) => create_accumulator::<Decimal32Type>(&args),
DataType::Decimal64(_, _) => create_accumulator::<Decimal64Type>(&args),
DataType::Decimal128(_, _) => create_accumulator::<Decimal128Type>(&args),
DataType::Decimal256(_, _) => create_accumulator::<Decimal256Type>(&args),

DataType::Timestamp(TimeUnit::Second, _) => {
create_accumulator::<TimestampSecondType>(args)
create_accumulator::<TimestampSecondType>(&args)
}
DataType::Timestamp(TimeUnit::Millisecond, _) => {
create_accumulator::<TimestampMillisecondType>(args)
create_accumulator::<TimestampMillisecondType>(&args)
}
DataType::Timestamp(TimeUnit::Microsecond, _) => {
create_accumulator::<TimestampMicrosecondType>(args)
create_accumulator::<TimestampMicrosecondType>(&args)
}
DataType::Timestamp(TimeUnit::Nanosecond, _) => {
create_accumulator::<TimestampNanosecondType>(args)
create_accumulator::<TimestampNanosecondType>(&args)
}

DataType::Date32 => create_accumulator::<Date32Type>(args),
DataType::Date64 => create_accumulator::<Date64Type>(args),
DataType::Date32 => create_accumulator::<Date32Type>(&args),
DataType::Date64 => create_accumulator::<Date64Type>(&args),
DataType::Time32(TimeUnit::Second) => {
create_accumulator::<Time32SecondType>(args)
create_accumulator::<Time32SecondType>(&args)
}
DataType::Time32(TimeUnit::Millisecond) => {
create_accumulator::<Time32MillisecondType>(args)
create_accumulator::<Time32MillisecondType>(&args)
}

DataType::Time64(TimeUnit::Microsecond) => {
create_accumulator::<Time64MicrosecondType>(args)
create_accumulator::<Time64MicrosecondType>(&args)
}
DataType::Time64(TimeUnit::Nanosecond) => {
create_accumulator::<Time64NanosecondType>(args)
create_accumulator::<Time64NanosecondType>(&args)
}

_ => {
Expand Down
3 changes: 3 additions & 0 deletions datafusion/functions-aggregate/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@
// specific language governing permissions and limitations
// under the License.

// https://github.com/apache/datafusion/issues/18503
#![deny(clippy::needless_pass_by_value)]
#![cfg_attr(test, allow(clippy::needless_pass_by_value))]
#![doc(
html_logo_url = "https://raw.githubusercontent.com/apache/datafusion/19fe44cf2f30cbdd63d4a4f52c74055163c6cc38/docs/logos/standalone_logo/logo_original.svg",
html_favicon_url = "https://raw.githubusercontent.com/apache/datafusion/19fe44cf2f30cbdd63d4a4f52c74055163c6cc38/docs/logos/standalone_logo/logo_original.svg"
Expand Down
4 changes: 2 additions & 2 deletions datafusion/functions-aggregate/src/percentile_cont.rs
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ impl PercentileCont {
}
}

fn create_accumulator(&self, args: AccumulatorArgs) -> Result<Box<dyn Accumulator>> {
fn create_accumulator(&self, args: &AccumulatorArgs) -> Result<Box<dyn Accumulator>> {
let percentile = validate_percentile_expr(&args.exprs[1], "PERCENTILE_CONT")?;

let is_descending = args
Expand Down Expand Up @@ -291,7 +291,7 @@ impl AggregateUDFImpl for PercentileCont {
}

fn accumulator(&self, acc_args: AccumulatorArgs) -> Result<Box<dyn Accumulator>> {
self.create_accumulator(acc_args)
self.create_accumulator(&acc_args)
}

fn groups_accumulator_supported(&self, args: AccumulatorArgs) -> bool {
Expand Down