Skip to content

fix(expr): preserve metadata across typed null values #90

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
osipovartem merged 1 commit into from
Sep 13, 2026
Merged

fix(expr): preserve metadata across typed null values #90

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
60 changes: 33 additions & 27 deletions datafusion/expr/src/logical_plan/builder.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,17 +316,21 @@ impl LogicalPlanBuilder {
continue;
}

let metadata = value.metadata(&schema)?;
if let Some(ref cm) = common_metadata {
if &metadata != cm {
return plan_err!(
"Inconsistent metadata across values list at row {i} column {j}. Was {:?} but found {:?}",
cm,
metadata
);
let is_null_literal =
matches!(value, Expr::Literal(value, _) if value.is_null());
if !is_null_literal {
let metadata = value.metadata(&schema)?;
if let Some(ref cm) = common_metadata {
if &metadata != cm {
return plan_err!(
"Inconsistent metadata across values list at row {i} column {j}. Was {:?} but found {:?}",
cm,
metadata
);
}
} else {
common_metadata = Some(metadata.clone());
}
} else {
common_metadata = Some(metadata.clone());
}

if let Some(prev_type) = common_type {
Expand Down Expand Up @@ -3253,23 +3257,25 @@ mod tests {
.is_err()
);

// Untyped NULL values adopt the type and metadata inferred from
// concrete values, regardless of their position in the column.
for values in [
vec![
vec![lit(ScalarValue::Null)],
vec![lit_with_metadata(1, Some(metadata.clone()))],
],
vec![
vec![lit_with_metadata(1, Some(metadata.clone()))],
vec![lit(ScalarValue::Null)],
],
] {
let plan = LogicalPlanBuilder::values(values)?.build()?;
let field = plan.schema().field(0);
assert_eq!(field.data_type(), &DataType::Int32);
assert!(field.is_nullable());
assert_eq!(*field.metadata(), metadata.to_hashmap());
// Untyped and typed NULL values adopt metadata inferred from concrete
// values, regardless of their position in the column.
for null in [ScalarValue::Null, ScalarValue::Int32(None)] {
for values in [
vec![
vec![lit(null.clone())],
vec![lit_with_metadata(1, Some(metadata.clone()))],
],
vec![
vec![lit_with_metadata(1, Some(metadata.clone()))],
vec![lit(null.clone())],
],
] {
let plan = LogicalPlanBuilder::values(values)?.build()?;
let field = plan.schema().field(0);
assert_eq!(field.data_type(), &DataType::Int32);
assert!(field.is_nullable());
assert_eq!(*field.metadata(), metadata.to_hashmap());
}
}

Ok(())
Expand Down
Loading