fix conflict

Signed-off-by: jayzhan211 <[email protected]>

Author: jayzhan211

datafusion/core/tests/user_defined/user_defined_aggregates.rs

@@ -431,7 +431,7 @@ async fn test_user_defined_functions_with_alias() -> Result<()> {
         vec![DataType::Float64],
         Arc::new(DataType::Float64),
         Volatility::Immutable,
-        Arc::new(|_| Ok(Box::<AvgAccumulator>::default())),
+        Arc::new(|_, _, _| Ok(Box::<AvgAccumulator>::default())),
         Arc::new(vec![DataType::UInt64, DataType::Float64]),
     )
     .with_aliases(vec!["dummy_alias"]);

datafusion/expr/src/function.rs

@@ -17,10 +17,9 @@
 
 //! Function module contains typing and signature for built-in and user defined functions.
 
-use crate::{Accumulator, BuiltinScalarFunction, Expr, PartitionEvaluator, Signature};
-use crate::{AggregateFunction, BuiltInWindowFunction, ColumnarValue};
+use crate::ColumnarValue;
+use crate::{Accumulator, Expr, PartitionEvaluator};
 use arrow::datatypes::{DataType, Schema};
-use datafusion_common::utils::datafusion_strsim;
 use datafusion_common::Result;
 use std::sync::Arc;
 

datafusion/expr/src/udaf.rs

@@ -355,8 +355,13 @@ impl AggregateUDFImpl for AliasedAggregateUDFImpl {
         self.inner.return_type(arg_types)
     }
 
-    fn accumulator(&self, arg: &DataType) -> Result<Box<dyn Accumulator>> {
-        self.inner.accumulator(arg)
+    fn accumulator(
+        &self,
+        arg: &DataType,
+        sort_exprs: &[Expr],
+        schema: &Schema,
+    ) -> Result<Box<dyn Accumulator>> {
+        self.inner.accumulator(arg, sort_exprs, schema)
     }
 
     fn state_type(&self, return_type: &DataType) -> Result<Vec<DataType>> {