Skip to content

Commit 0356891

Browse files
author
Puneet Dixit
committed
perf: pass arrays_zip field names to fast path
1 parent 973e3dc commit 0356891

1 file changed

Lines changed: 51 additions & 7 deletions

File tree

‎datafusion/functions-nested/src/arrays_zip.rs‎

Lines changed: 51 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ impl ScalarUDFImpl for ArraysZip {
130130
return exec_err!("arrays_zip expects array arguments, got {dt}");
131131
}
132132
};
133-
fields.push(Field::new(format!("{}", i + 1), element_type, true));
133+
fields.push(Field::new(arrays_zip_field_name(i), element_type, true));
134134
}
135135

136136
Ok(List(Arc::new(Field::new_list_field(
@@ -163,9 +163,10 @@ fn arrays_zip_inner(args: &[ArrayRef]) -> Result<ArrayRef> {
163163
return exec_err!("arrays_zip requires at least one argument");
164164
}
165165

166+
let field_names = arrays_zip_field_names(args.len());
166167
let num_rows = args[0].len();
167168

168-
if let Some(result) = try_perfect_list_zip(args)? {
169+
if let Some(result) = try_perfect_list_zip(args, &field_names)? {
169170
return Ok(result);
170171
}
171172

@@ -229,8 +230,8 @@ fn arrays_zip_inner(args: &[ArrayRef]) -> Result<ArrayRef> {
229230

230231
let struct_fields: Fields = element_types
231232
.iter()
232-
.enumerate()
233-
.map(|(i, dt)| Field::new(format!("{}", i + 1), dt.clone(), true))
233+
.zip(field_names.iter())
234+
.map(|(dt, name)| Field::new(name.clone(), dt.clone(), true))
234235
.collect::<Vec<_>>()
235236
.into();
236237

@@ -332,18 +333,31 @@ fn arrays_zip_inner(args: &[ArrayRef]) -> Result<ArrayRef> {
332333
Ok(Arc::new(result))
333334
}
334335

336+
fn arrays_zip_field_name(index: usize) -> String {
337+
(index + 1).to_string()
338+
}
339+
340+
fn arrays_zip_field_names(len: usize) -> Vec<String> {
341+
(0..len).map(arrays_zip_field_name).collect()
342+
}
343+
335344
/// Fast path for regular List inputs whose existing buffers already match the
336345
/// zipped output: all offsets and values lengths match, and null rows cover no
337346
/// values. This lets us reuse offsets and child values instead of rebuilding.
338-
fn try_perfect_list_zip(args: &[ArrayRef]) -> Result<Option<ArrayRef>> {
347+
fn try_perfect_list_zip(
348+
args: &[ArrayRef],
349+
field_names: &[String],
350+
) -> Result<Option<ArrayRef>> {
351+
debug_assert_eq!(args.len(), field_names.len());
352+
339353
let mut list_arrays = Vec::with_capacity(args.len());
340354
let mut struct_fields = Vec::with_capacity(args.len());
341355

342-
for (i, arg) in args.iter().enumerate() {
356+
for (arg, field_name) in args.iter().zip(field_names) {
343357
let arr = match arg.data_type() {
344358
List(field) => {
345359
struct_fields.push(Field::new(
346-
(i + 1).to_string(),
360+
field_name.clone(),
347361
field.data_type().clone(),
348362
true,
349363
));
@@ -465,6 +479,36 @@ mod tests {
465479
assert!(Arc::ptr_eq(values.column(1), right.values()));
466480
}
467481

482+
#[test]
483+
fn perfect_zip_uses_supplied_field_names() {
484+
let left = list(vec![1, 2, 3], vec![0, 1, 3]);
485+
let right = list(vec![10, 20, 30], vec![0, 1, 3]);
486+
let field_names = vec!["left".to_string(), "right".to_string()];
487+
488+
let result = try_perfect_list_zip(
489+
&[
490+
Arc::clone(&left) as ArrayRef,
491+
Arc::clone(&right) as ArrayRef,
492+
],
493+
&field_names,
494+
)
495+
.unwrap()
496+
.unwrap();
497+
let result = result.as_any().downcast_ref::<ListArray>().unwrap();
498+
let values = result
499+
.values()
500+
.as_any()
501+
.downcast_ref::<StructArray>()
502+
.unwrap();
503+
let names = values
504+
.fields()
505+
.iter()
506+
.map(|field| field.name().as_str())
507+
.collect::<Vec<_>>();
508+
509+
assert_eq!(names, vec!["left", "right"]);
510+
}
511+
468512
#[test]
469513
fn perfect_zip_reuses_zero_length_null_rows() {
470514
let left = list_with_validity(

0 commit comments

Comments
 (0)