@@ -893,6 +893,23 @@ impl PhysicalPlanner {
893893 expr. ordinal as usize ,
894894 ) ) )
895895 }
896+ ExprStruct :: ArrayExtrema ( expr) => {
897+ let child =
898+ self . create_expr ( expr. child . as_ref ( ) . unwrap ( ) , Arc :: clone ( & input_schema) ) ?;
899+ let udf = Arc :: new ( ScalarUDF :: from ( SparkArrayExtrema :: with_collations (
900+ expr. is_min ,
901+ & expr. string_collations ,
902+ expr. collation_unicode_version ,
903+ ) ?) ) ;
904+ let data_type = udf. return_type ( & [ child. data_type ( & input_schema) ?] ) ?;
905+ Ok ( Arc :: new ( ScalarFunctionExpr :: new (
906+ udf. name ( ) ,
907+ Arc :: clone ( & udf) ,
908+ vec ! [ child] ,
909+ Arc :: new ( Field :: new ( udf. name ( ) , data_type, true ) ) ,
910+ Arc :: new ( ConfigOptions :: default ( ) ) ,
911+ ) ) )
912+ }
896913 ExprStruct :: ArrayInsert ( expr) => {
897914 let src_array_expr = self . create_expr (
898915 expr. src_array_expr . as_ref ( ) . unwrap ( ) ,
@@ -3802,20 +3819,12 @@ impl PhysicalPlanner {
38023819 }
38033820 } ;
38043821
3805- let fun_expr = if matches ! ( fun_name. as_str( ) , "array_min" | "array_max" ) {
3806- Arc :: new ( ScalarUDF :: from ( SparkArrayExtrema :: with_collations (
3807- fun_name == "array_min" ,
3808- & expr. string_collations ,
3809- expr. collation_unicode_version ,
3810- ) ?) )
3811- } else {
3812- create_comet_physical_fun (
3813- fun_name,
3814- data_type. clone ( ) ,
3815- & self . session_ctx . state ( ) ,
3816- Some ( expr. fail_on_error ) ,
3817- ) ?
3818- } ;
3822+ let fun_expr = create_comet_physical_fun (
3823+ fun_name,
3824+ data_type. clone ( ) ,
3825+ & self . session_ctx . state ( ) ,
3826+ Some ( expr. fail_on_error ) ,
3827+ ) ?;
38193828
38203829 let args = args
38213830 . into_iter ( )
@@ -5213,6 +5222,55 @@ mod tests {
52135222 max_frame_size : usize ,
52145223 }
52155224
5225+ #[ test]
5226+ fn array_extrema_proto_preserves_mode_and_collation ( ) {
5227+ let values = ListArray :: new (
5228+ Arc :: new ( Field :: new ( "item" , DataType :: Utf8 , true ) ) ,
5229+ arrow:: buffer:: OffsetBuffer :: new ( vec ! [ 0 , 2 ] . into ( ) ) ,
5230+ Arc :: new ( StringArray :: from ( vec ! [ "a" , "B" ] ) ) ,
5231+ None ,
5232+ ) ;
5233+ let schema = Arc :: new ( Schema :: new ( vec ! [ Field :: new(
5234+ "values" ,
5235+ values. data_type( ) . clone( ) ,
5236+ true ,
5237+ ) ] ) ) ;
5238+ let batch = RecordBatch :: try_new ( Arc :: clone ( & schema) , vec ! [ Arc :: new( values) ] ) . unwrap ( ) ;
5239+ let planner = PhysicalPlanner :: default ( ) ;
5240+
5241+ for ( is_min, collations, expected) in [
5242+ ( true , vec ! [ ] , "B" ) ,
5243+ ( false , vec ! [ ] , "a" ) ,
5244+ ( true , vec ! [ "UTF8_LCASE" . to_string( ) ] , "a" ) ,
5245+ ( false , vec ! [ "UTF8_LCASE" . to_string( ) ] , "B" ) ,
5246+ ] {
5247+ let expr = Expr {
5248+ expr_struct : Some ( ExprStruct :: ArrayExtrema ( Box :: new (
5249+ spark_expression:: ArrayExtrema {
5250+ child : Some ( Box :: new ( Expr {
5251+ expr_struct : Some ( Bound ( spark_expression:: BoundReference {
5252+ index : 0 ,
5253+ datatype : None ,
5254+ } ) ) ,
5255+ ..Default :: default ( )
5256+ } ) ) ,
5257+ is_min,
5258+ string_collations : collations,
5259+ collation_unicode_version : 16 ,
5260+ } ,
5261+ ) ) ) ,
5262+ ..Default :: default ( )
5263+ } ;
5264+ let physical = planner. create_expr ( & expr, Arc :: clone ( & schema) ) . unwrap ( ) ;
5265+ assert_eq ! ( physical. data_type( & schema) . unwrap( ) , DataType :: Utf8 ) ;
5266+ let result = physical. evaluate ( & batch) . unwrap ( ) . into_array ( 1 ) . unwrap ( ) ;
5267+ assert_eq ! (
5268+ ScalarValue :: try_from_array( & result, 0 ) . unwrap( ) ,
5269+ ScalarValue :: Utf8 ( Some ( expected. to_string( ) ) )
5270+ ) ;
5271+ }
5272+ }
5273+
52165274 #[ test]
52175275 fn scan_default_rejects_struct_expressions ( ) {
52185276 let planner = PhysicalPlanner :: new ( Arc :: new ( SessionContext :: new ( ) ) , 0 ) ;
@@ -6578,7 +6636,6 @@ mod tests {
65786636 args: vec![ array_col, array_col_1] ,
65796637 return_type: None ,
65806638 fail_on_error: false ,
6581- ..Default :: default ( )
65826639 } ) ) ,
65836640 query_context: None ,
65846641 expr_id: None ,
@@ -6705,7 +6762,6 @@ mod tests {
67056762 args: vec![ array_col, array_col_1] ,
67066763 return_type: None ,
67076764 fail_on_error: false ,
6708- ..Default :: default ( )
67096765 } ) ) ,
67106766 query_context: None ,
67116767 expr_id: None ,
0 commit comments