Skip to content

fix: Substrait serialization mishandles sliced map literals #25543

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

Open
neilconway wants to merge 2 commits into
base: main
Choose a base branch
from
+31 −4
Open

fix: Substrait serialization mishandles sliced map literals #25543

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4447334
fix: preserve sliced map literals in Substrait
neilconway Sep 19, 2026
0433f76
.
neilconway Sep 20, 2026
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
35 changes: 31 additions & 4 deletions datafusion/substrait/src/logical_plan/producer/expr/literal.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,19 +286,20 @@ pub(crate) fn to_substrait_literal(
}?;
LiteralType::EmptyMap(mt)
} else {
let keys = (0..m.keys().len())
let entries = m.value(0);
let keys = (0..entries.len())
.map(|i| {
to_substrait_literal(
producer,
&ScalarValue::try_from_array(&m.keys(), i)?,
&ScalarValue::try_from_array(entries.column(0), i)?,
)
})
.collect::<datafusion::common::Result<Vec<_>>>()?;
let values = (0..m.values().len())
let values = (0..entries.len())
.map(|i| {
to_substrait_literal(
producer,
&ScalarValue::try_from_array(&m.values(), i)?,
&ScalarValue::try_from_array(entries.column(1), i)?,
)
})
.collect::<datafusion::common::Result<Vec<_>>>()?;
Expand Down Expand Up @@ -548,6 +549,32 @@ mod tests {
Ok(())
}

#[test]
fn round_trip_sliced_map_literals() -> Result<()> {
let mut builder =
MapBuilder::new(None, StringBuilder::new(), Int64Builder::new());
builder.keys().append_value("prefix");
builder.values().append_value(10);
builder.append(true)?;
builder.keys().append_value("selected");
builder.values().append_value(20);
builder.keys().append_value("null_value");
builder.values().append_null();
builder.append(true)?;
builder.append(true)?;
builder.append(false)?;
builder.keys().append_value("suffix");
builder.values().append_value(30);
builder.append(true)?;
let maps = builder.finish();

// Scalar extraction retains the other rows' entries in the backing arrays.
for row in 0..maps.len() {
round_trip_literal(ScalarValue::try_from_array(&maps, row)?)?;
}
Ok(())
}

fn round_trip_literal(scalar: ScalarValue) -> Result<()> {
println!("Checking round trip of {scalar:?}");
let state = SessionContext::default().state();
Expand Down
Loading