@@ -20,7 +20,8 @@ use datafusion::arrow::datatypes::{
2020 DataType , Field , FieldRef , Fields , IntervalUnit , Schema , TimeUnit ,
2121} ;
2222use datafusion:: common:: {
23- not_impl_err, substrait_datafusion_err, substrait_err, DFSchema , DFSchemaRef ,
23+ not_impl_datafusion_err, not_impl_err, substrait_datafusion_err, substrait_err,
24+ DFSchema , DFSchemaRef ,
2425} ;
2526use substrait:: proto:: expression:: literal:: IntervalDayToSecond ;
2627use substrait:: proto:: read_rel:: local_files:: file_or_files:: PathType :: UriFile ;
@@ -30,8 +31,7 @@ use arrow_buffer::{IntervalDayTime, IntervalMonthDayNano};
3031use datafusion:: execution:: FunctionRegistry ;
3132use datafusion:: logical_expr:: {
3233 aggregate_function, expr:: find_df_window_func, Aggregate , BinaryExpr , Case ,
33- EmptyRelation , Expr , ExprSchemable , LogicalPlan , Operator , Projection , ScalarUDF ,
34- Values ,
34+ EmptyRelation , Expr , ExprSchemable , LogicalPlan , Operator , Projection , Values ,
3535} ;
3636
3737use datafusion:: logical_expr:: {
@@ -1140,7 +1140,7 @@ pub async fn from_substrait_rex(
11401140 } else if let Some ( builder) = BuiltinExprBuilder :: try_from_name ( fn_name) {
11411141 builder. build ( ctx, f, input_schema, extensions) . await
11421142 } else {
1143- not_impl_err ! ( "Unsupported function name: {name :?}" )
1143+ not_impl_err ! ( "Unsupported function name: {fn_name :?}" )
11441144 }
11451145 }
11461146 Some ( RexType :: Literal ( lit) ) => {
@@ -1177,7 +1177,7 @@ pub async fn from_substrait_rex(
11771177 let fun = match ctx. udaf ( fn_name) {
11781178 Ok ( udaf) => Ok ( WindowFunctionDefinition :: AggregateUDF ( udaf) ) ,
11791179 Err ( _) => find_df_window_func ( fn_name) . ok_or_else ( || {
1180- not_impl_err ! (
1180+ not_impl_datafusion_err ! (
11811181 "Window function {} is not supported: function anchor = {:?}" ,
11821182 fn_name,
11831183 window. function_reference
0 commit comments