Skip to content

Commit 7c41323

Browse files
authored
Rename Expr::display_name to Expr::schema_name, make UNNEST naming conform to convention (#11797)
* introduce schema_name Signed-off-by: jayzhan211 <[email protected]> * fix Signed-off-by: jayzhan211 <[email protected]> * cleanup Signed-off-by: jayzhan211 <[email protected]> * cleanup Signed-off-by: jayzhan211 <[email protected]> * fix doc Signed-off-by: jayzhan211 <[email protected]> * reuse for simple case Signed-off-by: jayzhan211 <[email protected]> * unnest + udf Signed-off-by: jayzhan211 <[email protected]> * fmt Signed-off-by: jayzhan211 <[email protected]> * add display name for udf Signed-off-by: jayzhan211 <[email protected]> * fix name in udf Signed-off-by: jayzhan211 <[email protected]> * rename unnest Signed-off-by: jayzhan211 <[email protected]> * rm column Signed-off-by: jayzhan211 <[email protected]> * inlis Signed-off-by: jayzhan211 <[email protected]> * fmt Signed-off-by: jayzhan211 <[email protected]> * udaf Signed-off-by: jayzhan211 <[email protected]> * case Signed-off-by: jayzhan211 <[email protected]> * use write Signed-off-by: jayzhan211 <[email protected]> * fix test Signed-off-by: jayzhan211 <[email protected]> * fix window Signed-off-by: jayzhan211 <[email protected]> * window Signed-off-by: jayzhan211 <[email protected]> * like and similar to Signed-off-by: jayzhan211 <[email protected]> * rm display name Signed-off-by: jayzhan211 <[email protected]> * comment Signed-off-by: jayzhan211 <[email protected]> * cliip Signed-off-by: jayzhan211 <[email protected]> * fix doc Signed-off-by: jayzhan211 <[email protected]> * display Signed-off-by: jayzhan211 <[email protected]> * fix conflict Signed-off-by: jayzhan211 <[email protected]> * fix merge conflict Signed-off-by: jayzhan211 <[email protected]> * with display Signed-off-by: jayzhan211 <[email protected]> * function for exprs Signed-off-by: jayzhan211 <[email protected]> * clippy Signed-off-by: jayzhan211 <[email protected]> * fix doc Signed-off-by: jayzhan211 <[email protected]> --------- Signed-off-by: jayzhan211 <[email protected]>
1 parent 56f8e35 commit 7c41323

File tree

30 files changed

+494
-426
lines changed

30 files changed

+494
-426
lines changed

datafusion/core/src/physical_planner.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1529,7 +1529,7 @@ pub fn create_window_expr(
15291529
// unpack aliased logical expressions, e.g. "sum(col) over () as total"
15301530
let (name, e) = match e {
15311531
Expr::Alias(Alias { expr, name, .. }) => (name.clone(), expr.as_ref()),
1532-
_ => (e.display_name()?, e),
1532+
_ => (e.schema_name().to_string(), e),
15331533
};
15341534
create_window_expr_with_name(e, name, logical_schema, execution_props)
15351535
}
@@ -1620,7 +1620,7 @@ pub fn create_aggregate_expr_and_maybe_filter(
16201620
// unpack (nested) aliased logical expressions, e.g. "sum(col) as total"
16211621
let (name, e) = match e {
16221622
Expr::Alias(Alias { expr, name, .. }) => (Some(name.clone()), expr.as_ref()),
1623-
Expr::AggregateFunction(_) => (e.display_name().ok(), e),
1623+
Expr::AggregateFunction(_) => (Some(e.schema_name().to_string()), e),
16241624
_ => (None, e),
16251625
};
16261626

0 commit comments

Comments
 (0)