Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
17 changes: 7 additions & 10 deletions arrow-json/src/reader/list_array.rs
Original file line number Diff line number Diff line change
Expand Up @@ -112,16 +112,13 @@ impl<O: OffsetSizeTrait, const IS_VIEW: bool> ArrayDecoder for ListLikeArrayDeco
sizes.push(offsets[i] - offsets[i - 1]);
}
offsets.pop();
// SAFETY: offsets and sizes are constructed correctly from the tape
let array = unsafe {
GenericListViewArray::<O>::new_unchecked(
self.field.clone(),
ScalarBuffer::from(offsets),
ScalarBuffer::from(sizes),
values,
nulls,
)
};
let array = GenericListViewArray::<O>::try_new(
self.field.clone(),
ScalarBuffer::from(offsets),
ScalarBuffer::from(sizes),
values,
nulls,
)?;
Ok(Arc::new(array))
} else {
// SAFETY: offsets are built monotonically starting from 0
Expand Down
28 changes: 28 additions & 0 deletions arrow-json/src/reader/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2316,6 +2316,34 @@ mod tests {
assert_read_list_view::<i64>();
}

#[test]
fn test_read_list_view_rejects_null_non_nullable_child() {
let field = Arc::new(Field::new("item", DataType::Int32, false));
for (data_type, array_type) in [
(DataType::ListView(field.clone()), "ListViewArray"),
(DataType::LargeListView(field.clone()), "LargeListViewArray"),
] {
let schema = Arc::new(Schema::new(vec![Field::new("lv", data_type, true)]));
let buf = r#"
{"lv": [1, 2, 3]}
{"lv": [4, null]}
"#;

let error = ReaderBuilder::new(schema)
.build(Cursor::new(buf.as_bytes()))
.unwrap()
.collect::<Result<Vec<_>, _>>()
.unwrap_err();

assert_eq!(
error.to_string(),
format!(
"Invalid argument error: Non-nullable field of {array_type} \"item\" cannot contain nulls"
)
);
}
}

#[test]
fn test_fixed_size_list() {
let buf = r#"
Expand Down
Loading