@@ -33,8 +33,8 @@ use datafusion_physical_expr_common::physical_expr::PhysicalExpr;
3333
3434use crate :: expr:: {
3535 AggregateFunction , AggregateFunctionParams , ExprListDisplay , WindowFunctionParams ,
36- schema_name_from_exprs , schema_name_from_exprs_comma_separated_without_space ,
37- schema_name_from_sorts,
36+ schema_name_from_aggregate_args , schema_name_from_exprs ,
37+ schema_name_from_function_args , schema_name_from_sorts,
3838} ;
3939use crate :: function:: {
4040 AccumulatorArgs , AggregateFunctionSimplification , StateFieldsArgs ,
@@ -1088,7 +1088,7 @@ impl<'a> UdafSchemaNameBuilder<'a> {
10881088 "{}({}{})" ,
10891089 name,
10901090 if * distinct { "DISTINCT " } else { "" } ,
1091- schema_name_from_exprs_comma_separated_without_space ( args) ?
1091+ schema_name_from_aggregate_args ( args) ?
10921092 ) ) ?;
10931093
10941094 if let Some ( null_treatment) = null_treatment {
@@ -1266,13 +1266,13 @@ impl<'a> UdafWindowFunctionSchemaNameBuilder<'a> {
12661266 schema_name. write_fmt ( format_args ! (
12671267 "{}(DISTINCT {})" ,
12681268 name,
1269- schema_name_from_exprs ( args) ?
1269+ schema_name_from_function_args ( args) ?
12701270 ) ) ?;
12711271 } else {
12721272 schema_name. write_fmt ( format_args ! (
12731273 "{}({})" ,
12741274 name,
1275- schema_name_from_exprs ( args) ?
1275+ schema_name_from_function_args ( args) ?
12761276 ) ) ?;
12771277 }
12781278
@@ -1946,4 +1946,71 @@ mod test {
19461946
19471947 Ok ( ( ) )
19481948 }
1949+
1950+ #[ test]
1951+ fn test_udaf_schema_name_with_cast_distinction ( ) -> Result < ( ) > {
1952+ use crate :: expr:: { AggregateFunctionParams , WindowFunctionParams } ;
1953+ use crate :: {
1954+ UdafSchemaNameBuilder , UdafWindowFunctionSchemaNameBuilder , WindowFrame ,
1955+ cast, col,
1956+ } ;
1957+
1958+ let col_x = col ( "x" ) ;
1959+ let cast_x = cast ( col_x. clone ( ) , DataType :: Float32 ) ;
1960+
1961+ let params1 = AggregateFunctionParams {
1962+ args : vec ! [ col_x. clone( ) ] ,
1963+ distinct : false ,
1964+ filter : None ,
1965+ order_by : vec ! [ ] ,
1966+ null_treatment : None ,
1967+ } ;
1968+ let params2 = AggregateFunctionParams {
1969+ args : vec ! [ cast_x. clone( ) ] ,
1970+ distinct : false ,
1971+ filter : None ,
1972+ order_by : vec ! [ ] ,
1973+ null_treatment : None ,
1974+ } ;
1975+
1976+ let name1 = UdafSchemaNameBuilder :: new ( "sum" , & params1) . build ( ) ?;
1977+ let name2 = UdafSchemaNameBuilder :: new ( "sum" , & params2) . build ( ) ?;
1978+ assert_eq ! ( name1, "sum(x)" ) ;
1979+ assert_eq ! ( name2, "sum(CAST(x AS Float32))" ) ;
1980+ assert_ne ! ( name1, name2) ;
1981+
1982+ let win_params1 = WindowFunctionParams {
1983+ args : vec ! [ col_x] ,
1984+ partition_by : vec ! [ ] ,
1985+ order_by : vec ! [ ] ,
1986+ window_frame : WindowFrame :: new ( None ) ,
1987+ filter : None ,
1988+ null_treatment : None ,
1989+ distinct : false ,
1990+ } ;
1991+ let win_params2 = WindowFunctionParams {
1992+ args : vec ! [ cast_x] ,
1993+ partition_by : vec ! [ ] ,
1994+ order_by : vec ! [ ] ,
1995+ window_frame : WindowFrame :: new ( None ) ,
1996+ filter : None ,
1997+ null_treatment : None ,
1998+ distinct : false ,
1999+ } ;
2000+ let win_name1 =
2001+ UdafWindowFunctionSchemaNameBuilder :: new ( "sum" , & win_params1) . build ( ) ?;
2002+ let win_name2 =
2003+ UdafWindowFunctionSchemaNameBuilder :: new ( "sum" , & win_params2) . build ( ) ?;
2004+ assert_eq ! (
2005+ win_name1,
2006+ "sum(x) ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING"
2007+ ) ;
2008+ assert_eq ! (
2009+ win_name2,
2010+ "sum(CAST(x AS Float32)) ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING"
2011+ ) ;
2012+ assert_ne ! ( win_name1, win_name2) ;
2013+
2014+ Ok ( ( ) )
2015+ }
19492016}
0 commit comments