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
5 changes: 4 additions & 1 deletion arrow-json/src/writer/encoder.rs
Original file line number Diff line number Diff line change
Expand Up @@ -784,7 +784,10 @@ impl<'a> MapEncoder<'a> {
let values = array.values();
let keys = array.keys();

if !matches!(keys.data_type(), DataType::Utf8 | DataType::LargeUtf8) {
if !matches!(
keys.data_type(),
DataType::Utf8 | DataType::LargeUtf8 | DataType::Utf8View
) {
return Err(ArrowError::JsonError(format!(
"Only UTF8 keys supported by JSON MapArray Writer: got {:?}",
keys.data_type()
Expand Down
27 changes: 20 additions & 7 deletions arrow-json/src/writer/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1389,16 +1389,14 @@ mod tests {
);
}

#[test]
fn json_writer_map() {
let keys_array = super::StringArray::from(vec!["foo", "bar", "baz", "qux", "quux"]);
fn run_json_writer_map_with_keys(keys_array: ArrayRef) {
let values_array = super::Int64Array::from(vec![10, 20, 30, 40, 50]);

let keys = Arc::new(Field::new("keys", DataType::Utf8, false));
let values = Arc::new(Field::new("values", DataType::Int64, false));
let keys_field = Arc::new(Field::new("keys", keys_array.data_type().clone(), false));
let values_field = Arc::new(Field::new("values", DataType::Int64, false));
let entry_struct = StructArray::from(vec![
(keys, Arc::new(keys_array) as ArrayRef),
(values, Arc::new(values_array) as ArrayRef),
(keys_field, keys_array.clone()),
(values_field, Arc::new(values_array) as ArrayRef),
]);

let map_data_type = DataType::Map(
Expand Down Expand Up @@ -1447,6 +1445,21 @@ mod tests {
);
}

#[test]
fn json_writer_map() {
// Utf8 (StringArray)
let keys_utf8 = super::StringArray::from(vec!["foo", "bar", "baz", "qux", "quux"]);
run_json_writer_map_with_keys(Arc::new(keys_utf8) as ArrayRef);

// LargeUtf8 (LargeStringArray)
let keys_large = super::LargeStringArray::from(vec!["foo", "bar", "baz", "qux", "quux"]);
run_json_writer_map_with_keys(Arc::new(keys_large) as ArrayRef);

// Utf8View (StringViewArray)
let keys_view = super::StringViewArray::from(vec!["foo", "bar", "baz", "qux", "quux"]);
run_json_writer_map_with_keys(Arc::new(keys_view) as ArrayRef);
}

#[test]
fn test_write_single_batch() {
let test_file = "test/data/basic.json";
Expand Down
Loading