fix merge conflict

Author: goldmedal

datafusion/core/src/physical_planner.rs

@@ -96,7 +96,6 @@ use datafusion_physical_plan::unnest::ListUnnest;
 use sqlparser::ast::NullTreatment;
 
 use async_trait::async_trait;
-use datafusion_datasource::file_groups::FileGroup;
 use datafusion_physical_plan::async_func::{AsyncFuncExec, AsyncMapper};
 use futures::{StreamExt, TryStreamExt};
 use itertools::{multiunzip, Itertools};

datafusion/expr/src/async_udf.rs

@@ -17,7 +17,7 @@
 
 use crate::{ReturnFieldArgs, ScalarFunctionArgs, ScalarUDF, ScalarUDFImpl};
 use arrow::array::ArrayRef;
-use arrow::datatypes::{DataType, Field, SchemaRef};
+use arrow::datatypes::{DataType, Field, FieldRef, SchemaRef};
 use async_trait::async_trait;
 use datafusion_common::config::ConfigOptions;
 use datafusion_common::error::Result;
@@ -52,15 +52,15 @@ pub trait AsyncScalarUDFImpl: Debug + Send + Sync {
     ///
     /// By default, this function calls [`Self::return_type`] with the
     /// types of each argument.
-    fn return_field_from_args(&self, args: ReturnFieldArgs) -> Result<Field> {
+    fn return_field_from_args(&self, args: ReturnFieldArgs) -> Result<FieldRef> {
         let data_types = args
             .arg_fields
             .iter()
             .map(|f| f.data_type())
             .cloned()
             .collect::<Vec<_>>();
         let return_type = self.return_type(&data_types)?;
-        Ok(Field::new(self.name(), return_type, true))
+        Ok(Arc::new(Field::new(self.name(), return_type, true)))
     }
 
     /// The ideal batch size for this function.
@@ -131,7 +131,7 @@ impl ScalarUDFImpl for AsyncScalarUDF {
         self.inner.return_type(arg_types)
     }
 
-    fn return_field_from_args(&self, args: ReturnFieldArgs) -> Result<Field> {
+    fn return_field_from_args(&self, args: ReturnFieldArgs) -> Result<FieldRef> {
         self.inner.return_field_from_args(args)
     }
 

datafusion/physical-plan/src/async_func.rs

@@ -73,7 +73,7 @@ impl AsyncFuncExec {
             .iter()
             .map(|expr| (Arc::clone(&expr.func), expr.name().to_string()))
             .collect::<Vec<_>>();
-        let async_expr_mapping = ProjectionMapping::try_new(&tuples, &input.schema())?;
+        let async_expr_mapping = ProjectionMapping::try_new(tuples, &input.schema())?;
         let cache =
             AsyncFuncExec::compute_properties(&input, schema, &async_expr_mapping)?;
         Ok(Self {

datafusion/physical-plan/src/lib.rs

@@ -59,8 +59,8 @@ mod visitor;
 
 pub mod aggregates;
 pub mod analyze;
-pub mod coalesce;
 pub mod async_func;
+pub mod coalesce;
 pub mod coalesce_batches;
 pub mod coalesce_partitions;
 pub mod common;