Skip to content

Apache DataFusion SQL Query Engine

fix: support zero-field struct group keys in aggregate emit (#25282)

Fredrik Fornwall348553bbaf5b
diff --git a/datafusion/physical-plan/src/aggregates/group_values/row.rs b/datafusion/physical-plan/src/aggregates/group_values/row.rs
index 1bbd3e2297..9604087c33 100644
--- a/datafusion/physical-plan/src/aggregates/group_values/row.rs
+++ b/datafusion/physical-plan/src/aggregates/group_values/row.rs
@@ -316,10 +316,12 @@ pub(crate) fn encode_array_if_necessary(
})
.collect::<Result<Vec<_>>>()?;
- Ok(Arc::new(StructArray::try_new(
+ // A zero-field struct has no child to infer the length from.
+ Ok(Arc::new(StructArray::try_new_with_length(
expected_fields.clone(),
arrays,
struct_array.nulls().cloned(),
+ struct_array.len(),
)?))
}
(DataType::List(expected_field), &DataType::List(_)) => {
diff --git a/datafusion/sqllogictest/test_files/struct.slt b/datafusion/sqllogictest/test_files/struct.slt
index 224f1a750c..ff0bf2ef9d 100644
--- a/datafusion/sqllogictest/test_files/struct.slt
+++ b/datafusion/sqllogictest/test_files/struct.slt
@@ -1872,3 +1872,21 @@ select a, s['b'] from (select -a as a, s from leaf_same_name order by a);
statement ok
drop table leaf_same_name;
+
+# GROUP BY / DISTINCT over a zero-field struct key must not panic on emit
+query ?I
+select arrow_cast(null, 'Struct()') as s, count(*) from (values (1),(2),(3)) group by 1;
+----
+NULL 3
+
+query ?
+select distinct arrow_cast(null, 'Struct()') as s from (values (1),(2));
+----
+NULL
+
+query ?I rowsort
+select named_struct('a', column1, 'z', arrow_cast(null, 'Struct()')) as s, count(*)
+from (values (1),(2),(1)) group by 1;
+----
+{a: 1, z: NULL} 2
+{a: 2, z: NULL} 1