Apache DataFusion SQL Query Engine
fix: prevent CSE from extracting window functions (#24750)
Christian Del Monte293f5ebda418
diff --git a/datafusion/core/tests/dataframe/mod.rs b/datafusion/core/tests/dataframe/mod.rsindex 527c956749..4e32ea3116 100644--- a/datafusion/core/tests/dataframe/mod.rs+++ b/datafusion/core/tests/dataframe/mod.rs@@ -206,6 +206,23 @@ async fn with_column_window_functions() -> DataFusionResult<()> {Ok(())}+#[tokio::test]+async fn duplicated_window_functions_can_be_executed() -> Result<()> {+ let wexpr = datafusion::functions_window::row_number::row_number_udwf().call(vec![]);++ let plan = LogicalPlanBuilder::empty(true)+ .window(vec![wexpr.clone(), wexpr.alias("aliased")])?+ .build()?;++ let ctx = SessionContext::new();++ let collected = DataFrame::new(ctx.state(), plan).collect().await?;++ assert_eq!(collected.iter().map(|b| b.num_rows()).sum::<usize>(), 1);++ Ok(())+}+#[tokio::test]async fn test_coalesce_schema() -> Result<()> {let ctx = SessionContext::new();diff --git a/datafusion/optimizer/src/common_subexpr_eliminate.rs b/datafusion/optimizer/src/common_subexpr_eliminate.rsindex 6004ccb86e..9a9ffc36a1 100644--- a/datafusion/optimizer/src/common_subexpr_eliminate.rs+++ b/datafusion/optimizer/src/common_subexpr_eliminate.rs@@ -733,6 +733,7 @@ impl CSEController for ExprCSEController<'_> {| Expr::Wildcard { .. }| Expr::Lambda(_)| Expr::LambdaVariable(_)+ | Expr::WindowFunction(..));let is_aggr = matches!(node, Expr::AggregateFunction(..));@@ -857,6 +858,7 @@ mod test {use crate::test::udfs::leaf_udf_expr;use crate::test::*;use datafusion_expr::test::function_stub::{avg, sum};+ use datafusion_functions_window::row_number::row_number_udwf;macro_rules! assert_optimized_plan_equal {(@@ -1933,4 +1935,21 @@ mod test {")}++ #[test]+ fn test_window_function_is_not_extracted() -> Result<()> {+ let wexpr = row_number_udwf().call(vec![]);++ let plan = LogicalPlanBuilder::empty(true)+ .window(vec![wexpr.clone(), wexpr.alias("aliased")])?+ .build()?;++ assert_optimized_plan_equal!(+ plan,+ @r"+ WindowAggr: windowExpr=[[row_number() ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING, row_number() ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING AS aliased]]+ EmptyRelation: rows=1+ "+ )+ }}