Apache DataFusion SQL Query Engine
Enforce unique names for `is_set` on `first_value` and `last_value` (#18303)
Marc Brinkmann6ee019efb79c
diff --git a/datafusion/core/tests/dataframe/mod.rs b/datafusion/core/tests/dataframe/mod.rsindex 17d1695478..043f42b18c 100644--- a/datafusion/core/tests/dataframe/mod.rs+++ b/datafusion/core/tests/dataframe/mod.rs@@ -6459,10 +6459,10 @@ async fn test_duplicate_state_fields_for_dfschema_construct() -> Result<()> {"ticker","first_value(value)[first_value]","timestamp@0",- "is_set",+ "first_value(value)[first_value_is_set]","last_value(value)[last_value]","timestamp@0",- "is_set",+ "last_value(value)[last_value_is_set]",];let binding = partial_agg.schema();diff --git a/datafusion/functions-aggregate/src/first_last.rs b/datafusion/functions-aggregate/src/first_last.rsindex 28755427c7..b2a40ff50b 100644--- a/datafusion/functions-aggregate/src/first_last.rs+++ b/datafusion/functions-aggregate/src/first_last.rs@@ -166,7 +166,14 @@ impl AggregateUDFImpl for FirstValue {).into()];fields.extend(args.ordering_fields.iter().cloned());- fields.push(Field::new("is_set", DataType::Boolean, true).into());+ fields.push(+ Field::new(+ format_state_name(args.name, "first_value_is_set"),+ DataType::Boolean,+ true,+ )+ .into(),+ );Ok(fields)}@@ -1087,7 +1094,14 @@ impl AggregateUDFImpl for LastValue {).into()];fields.extend(args.ordering_fields.iter().cloned());- fields.push(Field::new("is_set", DataType::Boolean, true).into());+ fields.push(+ Field::new(+ format_state_name(args.name, "last_value_is_set"),+ DataType::Boolean,+ true,+ )+ .into(),+ );Ok(fields)}