From 92370c4ea08f7a1030617dea53464ff93db7b2d0 Mon Sep 17 00:00:00 2001 From: andre-cc-natzka Date: Wed, 14 Dec 2022 22:54:41 +0100 Subject: [PATCH 1/2] Add line that prevents display_name from being called on Wildcard --- datafusion/optimizer/src/utils.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/datafusion/optimizer/src/utils.rs b/datafusion/optimizer/src/utils.rs index c5496b5237f4..41d7f6add38b 100644 --- a/datafusion/optimizer/src/utils.rs +++ b/datafusion/optimizer/src/utils.rs @@ -583,6 +583,7 @@ where fn name_for_alias(expr: &Expr) -> Result { match expr { Expr::Sort { expr, .. } => name_for_alias(expr), + Expr::Wildcard => Ok("*".to_string()), expr => expr.display_name(), } } From 315c451789a1c325075a99c6548689477e0c2a66 Mon Sep 17 00:00:00 2001 From: andre-cc-natzka Date: Wed, 21 Dec 2022 09:22:07 +0100 Subject: [PATCH 2/2] Move wildcard line to create_name() --- datafusion/expr/src/expr.rs | 4 +--- datafusion/optimizer/src/utils.rs | 1 - 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/datafusion/expr/src/expr.rs b/datafusion/expr/src/expr.rs index 2017d1e8da70..543b51408e23 100644 --- a/datafusion/expr/src/expr.rs +++ b/datafusion/expr/src/expr.rs @@ -1253,9 +1253,7 @@ fn create_name(e: &Expr) -> Result { Expr::Sort { .. } => Err(DataFusionError::Internal( "Create name does not support sort expression".to_string(), )), - Expr::Wildcard => Err(DataFusionError::Internal( - "Create name does not support wildcard".to_string(), - )), + Expr::Wildcard => Ok("*".to_string()), Expr::QualifiedWildcard { .. } => Err(DataFusionError::Internal( "Create name does not support qualified wildcard".to_string(), )), diff --git a/datafusion/optimizer/src/utils.rs b/datafusion/optimizer/src/utils.rs index 41d7f6add38b..c5496b5237f4 100644 --- a/datafusion/optimizer/src/utils.rs +++ b/datafusion/optimizer/src/utils.rs @@ -583,7 +583,6 @@ where fn name_for_alias(expr: &Expr) -> Result { match expr { Expr::Sort { expr, .. } => name_for_alias(expr), - Expr::Wildcard => Ok("*".to_string()), expr => expr.display_name(), } }