Skip to content

Fix array types coercion: preserve child element nullability for list types #17306

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 9, 2025
Merged

Fix array types coercion: preserve child element nullability for list types #17306

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bf70047
Fix array types coercion: preserve child element nullability for list…
sgrebnov Aug 23, 2025
9170de2
Merge branch 'main' into sgrebnov/upstream-fix-type-coercion
sgrebnov Aug 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
78 changes: 58 additions & 20 deletions datafusion/expr/src/type_coercion/functions.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -401,25 +401,35 @@ fn get_valid_types(
let mut fixed_size = array_coercion != Some(&ListCoercion::FixedSizedListToList);
let mut list_sizes = Vec::with_capacity(arguments.len());
let mut element_types = Vec::with_capacity(arguments.len());
let mut nested_item_nullability = Vec::with_capacity(arguments.len());
for (argument, current_type) in arguments.iter().zip(current_types.iter()) {
match argument {
ArrayFunctionArgument::Index | ArrayFunctionArgument::String => (),
ArrayFunctionArgument::Index | ArrayFunctionArgument::String => {
nested_item_nullability.push(None);
}
ArrayFunctionArgument::Element => {
element_types.push(current_type.clone())
element_types.push(current_type.clone());
nested_item_nullability.push(None);
}
ArrayFunctionArgument::Array => match current_type {
DataType::Null => element_types.push(DataType::Null),
DataType::Null => {
element_types.push(DataType::Null);
nested_item_nullability.push(None);
}
DataType::List(field) => {
element_types.push(field.data_type().clone());
nested_item_nullability.push(Some(field.is_nullable()));
fixed_size = false;
}
DataType::LargeList(field) => {
element_types.push(field.data_type().clone());
nested_item_nullability.push(Some(field.is_nullable()));
large_list = true;
fixed_size = false;
}
DataType::FixedSizeList(field, size) => {
element_types.push(field.data_type().clone());
nested_item_nullability.push(Some(field.is_nullable()));
list_sizes.push(*size)
}
arg_type => {
Expand All @@ -429,33 +439,49 @@ fn get_valid_types(
}
}

debug_assert_eq!(nested_item_nullability.len(), arguments.len());

let Some(element_type) = type_union_resolution(&element_types) else {
return Ok(vec![vec![]]);
};

if !fixed_size {
list_sizes.clear()
}
};

let mut list_sizes = list_sizes.into_iter();
let valid_types = arguments.iter().zip(current_types.iter()).map(
|(argument_type, current_type)| match argument_type {
ArrayFunctionArgument::Index => DataType::Int64,
ArrayFunctionArgument::String => DataType::Utf8,
ArrayFunctionArgument::Element => element_type.clone(),
ArrayFunctionArgument::Array => {
if current_type.is_null() {
DataType::Null
} else if large_list {
DataType::new_large_list(element_type.clone(), true)
} else if let Some(size) = list_sizes.next() {
DataType::new_fixed_size_list(element_type.clone(), size, true)
} else {
DataType::new_list(element_type.clone(), true)
let valid_types = arguments
.iter()
.zip(current_types.iter())
.zip(nested_item_nullability)
.map(|((argument_type, current_type), is_nested_item_nullable)| {
match argument_type {
ArrayFunctionArgument::Index => DataType::Int64,
ArrayFunctionArgument::String => DataType::Utf8,
ArrayFunctionArgument::Element => element_type.clone(),
ArrayFunctionArgument::Array => {
if current_type.is_null() {
DataType::Null
} else if large_list {
DataType::new_large_list(
element_type.clone(),
is_nested_item_nullable.unwrap_or(true),
)
} else if let Some(size) = list_sizes.next() {
DataType::new_fixed_size_list(
element_type.clone(),
size,
is_nested_item_nullable.unwrap_or(true),
)
} else {
DataType::new_list(
element_type.clone(),
is_nested_item_nullable.unwrap_or(true),
)
}
}
}
},
);
});

Ok(vec![valid_types.collect()])
}
Expand Down Expand Up @@ -1343,6 +1369,18 @@ mod tests {
vec![vec![]]
);

let data_types = vec![
DataType::new_fixed_size_list(DataType::Int64, 3, false),
DataType::new_list(DataType::Int32, false),
];
assert_eq!(
get_valid_types(function, &signature.type_signature, &data_types)?,
vec![vec![
DataType::new_list(DataType::Int64, false),
DataType::new_list(DataType::Int64, false),
]]
);

Ok(())
}
}