Skip to content

Commit 4f05fed

Browse files
committed
chore: bump object_store to 0.14.1
1 parent 0639afa commit 4f05fed

4 files changed

Lines changed: 18 additions & 9 deletions

File tree

datafusion/common/src/nested_struct.rs

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -509,7 +509,7 @@ mod tests {
509509
use arrow::{
510510
array::{
511511
BinaryArray, Int32Array, Int32Builder, Int64Array, ListArray, ListViewArray,
512-
MapArray, MapBuilder, NullArray, StringArray, StringBuilder,
512+
MapArray, MapBuilder, MapFieldNames, NullArray, StringArray, StringBuilder,
513513
},
514514
buffer::{NullBuffer, ScalarBuffer},
515515
datatypes::{DataType, Field, FieldRef, Int32Type},
@@ -1009,10 +1009,19 @@ mod tests {
10091009
None,
10101010
])) as ArrayRef;
10111011

1012-
// Map field with second row null
1012+
// Map field with second row null. Use explicit field names matching the
1013+
// target schema; arrow's `MapBuilder` default is now `key`/`value`.
10131014
let string_builder = StringBuilder::new();
10141015
let int_builder = Int32Builder::new();
1015-
let mut map_builder = MapBuilder::new(None, string_builder, int_builder);
1016+
let mut map_builder = MapBuilder::new(
1017+
Some(MapFieldNames {
1018+
entry: "entries".to_string(),
1019+
key: "keys".to_string(),
1020+
value: "values".to_string(),
1021+
}),
1022+
string_builder,
1023+
int_builder,
1024+
);
10161025
map_builder.keys().append_value("a");
10171026
map_builder.values().append_value(1);
10181027
map_builder.append(true).unwrap();

datafusion/functions/src/core/arrow_field.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,8 @@ impl ArrowFieldFunc {
8080
Arc::new(Field::new(
8181
"entries",
8282
DataType::Struct(Fields::from(vec![
83-
Field::new("keys", DataType::Utf8, false),
84-
Field::new("values", DataType::Utf8, true),
83+
Field::new("key", DataType::Utf8, false),
84+
Field::new("value", DataType::Utf8, true),
8585
])),
8686
false,
8787
)),

datafusion/functions/src/core/arrow_metadata.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,8 @@ impl ScalarUDFImpl for ArrowMetadataFunc {
104104
Arc::new(Field::new(
105105
"entries",
106106
DataType::Struct(Fields::from(vec![
107-
Field::new("keys", DataType::Utf8, false),
108-
Field::new("values", DataType::Utf8, true),
107+
Field::new("key", DataType::Utf8, false),
108+
Field::new("value", DataType::Utf8, true),
109109
])),
110110
false,
111111
)),

datafusion/proto/tests/cases/roundtrip_logical_plan.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2216,7 +2216,7 @@ fn round_trip_scalar_values_and_data_types() {
22162216
Arc::new(Field::new(
22172217
"entries",
22182218
DataType::Struct(Fields::from(vec![
2219-
Field::new("key", DataType::Int32, true),
2219+
Field::new("key", DataType::Int32, false),
22202220
Field::new("value", DataType::Utf8, false),
22212221
])),
22222222
false,
@@ -2228,7 +2228,7 @@ fn round_trip_scalar_values_and_data_types() {
22282228
Arc::new(Field::new(
22292229
"entries",
22302230
DataType::Struct(Fields::from(vec![
2231-
Field::new("key", DataType::Int32, true),
2231+
Field::new("key", DataType::Int32, false),
22322232
Field::new("value", DataType::Utf8, true),
22332233
])),
22342234
false,

0 commit comments

Comments
 (0)