chore: bump object_store to 0.14.1

Cargo.toml

@@ -176,7 +176,7 @@ liblzma = { version = "0.4.6", features = ["static"] }
 log = "^0.4"
 memchr = "2.8.1"
 num-traits = { version = "0.2" }
-object_store = { version = "0.13.2", default-features = false }
+object_store = { version = "0.14.1", default-features = false }
 parking_lot = "0.12"
 parquet = { version = "59.1.0", default-features = false, features = [
     "arrow",
@@ -294,3 +294,27 @@ debug = false
 debug-assertions = false
 strip = "debuginfo"
 incremental = false
+
+# Force all transitive uses of `object_store` (e.g., the `parquet` crate) to
+# resolve to the local 0.14.1 checkout while we are transitioning the API.
+# Also patch the arrow/parquet crates to arrow-rs revision 30ae8d3 ("chore:
+# bump object_store to 0.14.1") so their `parquet` depends on the same
+# object_store 0.14.1 rather than 0.13.x from crates.io.
+[patch.crates-io]
+arrow = { git = "https://github.com/comphead/arrow-rs.git", rev = "30ae8d3ef84207ee184d1f6207d1f6485d02a276" }
+arrow-arith = { git = "https://github.com/comphead/arrow-rs.git", rev = "30ae8d3ef84207ee184d1f6207d1f6485d02a276" }
+arrow-array = { git = "https://github.com/comphead/arrow-rs.git", rev = "30ae8d3ef84207ee184d1f6207d1f6485d02a276" }
+arrow-avro = { git = "https://github.com/comphead/arrow-rs.git", rev = "30ae8d3ef84207ee184d1f6207d1f6485d02a276" }
+arrow-buffer = { git = "https://github.com/comphead/arrow-rs.git", rev = "30ae8d3ef84207ee184d1f6207d1f6485d02a276" }
+arrow-cast = { git = "https://github.com/comphead/arrow-rs.git", rev = "30ae8d3ef84207ee184d1f6207d1f6485d02a276" }
+arrow-csv = { git = "https://github.com/comphead/arrow-rs.git", rev = "30ae8d3ef84207ee184d1f6207d1f6485d02a276" }
+arrow-data = { git = "https://github.com/comphead/arrow-rs.git", rev = "30ae8d3ef84207ee184d1f6207d1f6485d02a276" }
+arrow-flight = { git = "https://github.com/comphead/arrow-rs.git", rev = "30ae8d3ef84207ee184d1f6207d1f6485d02a276" }
+arrow-ipc = { git = "https://github.com/comphead/arrow-rs.git", rev = "30ae8d3ef84207ee184d1f6207d1f6485d02a276" }
+arrow-json = { git = "https://github.com/comphead/arrow-rs.git", rev = "30ae8d3ef84207ee184d1f6207d1f6485d02a276" }
+arrow-ord = { git = "https://github.com/comphead/arrow-rs.git", rev = "30ae8d3ef84207ee184d1f6207d1f6485d02a276" }
+arrow-row = { git = "https://github.com/comphead/arrow-rs.git", rev = "30ae8d3ef84207ee184d1f6207d1f6485d02a276" }
+arrow-schema = { git = "https://github.com/comphead/arrow-rs.git", rev = "30ae8d3ef84207ee184d1f6207d1f6485d02a276" }
+arrow-select = { git = "https://github.com/comphead/arrow-rs.git", rev = "30ae8d3ef84207ee184d1f6207d1f6485d02a276" }
+arrow-string = { git = "https://github.com/comphead/arrow-rs.git", rev = "30ae8d3ef84207ee184d1f6207d1f6485d02a276" }
+parquet = { git = "https://github.com/comphead/arrow-rs.git", rev = "30ae8d3ef84207ee184d1f6207d1f6485d02a276" }

datafusion-cli/src/main.rs

@@ -842,14 +842,14 @@ mod tests {
             ])?
             .sort(vec![col("filename").sort(true, false)])?;
         let rbs = df.collect().await?;
-        assert_snapshot!(batches_to_string(&rbs),@r"
+        assert_snapshot!(batches_to_string(&rbs),@r#"
         +---------------------+-----------+-----------------+------+------+
         | metadata_size_bytes | filename  | file_size_bytes | etag | hits |
         +---------------------+-----------+-----------------+------+------+
-        | 212                 | 0.parquet | 3642            | 0    | 2    |
-        | 212                 | 1.parquet | 3642            | 1    | 2    |
+        | 216                 | 0.parquet | 3642            | "0"  | 2    |
+        | 216                 | 1.parquet | 3642            | "1"  | 2    |
         +---------------------+-----------+-----------------+------+------+
-        ");
+        "#);
 
         Ok(())
     }

datafusion-cli/src/object_storage.rs

@@ -112,7 +112,7 @@ async fn get_s3_object_store_builder_inner(
         let CredentialsFromConfig {
             region,
             credentials,
-        } = CredentialsFromConfig::try_new().await?;
+        } = Box::pin(CredentialsFromConfig::try_new()).await?;
         if let Some(region) = region {
             builder = builder.with_region(region);
         }

datafusion/common/src/nested_struct.rs

@@ -509,7 +509,7 @@ mod tests {
     use arrow::{
         array::{
             BinaryArray, Int32Array, Int32Builder, Int64Array, ListArray, ListViewArray,
-            MapArray, MapBuilder, NullArray, StringArray, StringBuilder,
+            MapArray, MapBuilder, MapFieldNames, NullArray, StringArray, StringBuilder,
         },
         buffer::{NullBuffer, ScalarBuffer},
         datatypes::{DataType, Field, FieldRef, Int32Type},
@@ -1009,10 +1009,19 @@ mod tests {
             None,
         ])) as ArrayRef;
 
-        // Map field with second row null
+        // Map field with second row null. Use explicit field names matching the
+        // target schema; arrow's `MapBuilder` default is now `key`/`value`.
         let string_builder = StringBuilder::new();
         let int_builder = Int32Builder::new();
-        let mut map_builder = MapBuilder::new(None, string_builder, int_builder);
+        let mut map_builder = MapBuilder::new(
+            Some(MapFieldNames {
+                entry: "entries".to_string(),
+                key: "keys".to_string(),
+                value: "values".to_string(),
+            }),
+            string_builder,
+            int_builder,
+        );
         map_builder.keys().append_value("a");
         map_builder.values().append_value(1);
         map_builder.append(true).unwrap();

datafusion/core/src/datasource/file_format/csv.rs

@@ -136,6 +136,7 @@ mod tests {
                 },
                 range: Default::default(),
                 attributes: Attributes::default(),
+                extensions: Default::default(),
             })
         }
 

datafusion/core/tests/sql/path_partition.rs

@@ -718,6 +718,7 @@ impl ObjectStore for MirroringObjectStore {
             payload,
             meta,
             attributes: Attributes::default(),
+            extensions: Default::default(),
         })
     }
 
@@ -789,6 +790,7 @@ impl ObjectStore for MirroringObjectStore {
         Ok(ListResult {
             common_prefixes: common_prefixes.into_iter().collect(),
             objects,
+            extensions: Default::default(),
         })
     }
 

datafusion/functions/src/core/arrow_field.rs

@@ -80,8 +80,8 @@ impl ArrowFieldFunc {
                     Arc::new(Field::new(
                         "entries",
                         DataType::Struct(Fields::from(vec![
-                            Field::new("keys", DataType::Utf8, false),
-                            Field::new("values", DataType::Utf8, true),
+                            Field::new("key", DataType::Utf8, false),
+                            Field::new("value", DataType::Utf8, true),
                         ])),
                         false,
                     )),

datafusion/functions/src/core/arrow_metadata.rs

@@ -104,8 +104,8 @@ impl ScalarUDFImpl for ArrowMetadataFunc {
                 Arc::new(Field::new(
                     "entries",
                     DataType::Struct(Fields::from(vec![
-                        Field::new("keys", DataType::Utf8, false),
-                        Field::new("values", DataType::Utf8, true),
+                        Field::new("key", DataType::Utf8, false),
+                        Field::new("value", DataType::Utf8, true),
                     ])),
                     false,
                 )),

datafusion/proto/tests/cases/roundtrip_logical_plan.rs

@@ -2216,7 +2216,7 @@ fn round_trip_scalar_values_and_data_types() {
                 Arc::new(Field::new(
                     "entries",
                     DataType::Struct(Fields::from(vec![
-                        Field::new("key", DataType::Int32, true),
+                        Field::new("key", DataType::Int32, false),
                         Field::new("value", DataType::Utf8, false),
                     ])),
                     false,
@@ -2228,7 +2228,7 @@ fn round_trip_scalar_values_and_data_types() {
                 Arc::new(Field::new(
                     "entries",
                     DataType::Struct(Fields::from(vec![
-                        Field::new("key", DataType::Int32, true),
+                        Field::new("key", DataType::Int32, false),
                         Field::new("value", DataType::Utf8, true),
                     ])),
                     false,