Skip to content

Apache DataFusion SQL Query Engine

chore(deps): bump object_store from 0.13.1 to 0.13.2 (#21275)

dependabot[bot]e5358b7e535f
diff --git a/Cargo.lock b/Cargo.lock
index ca723a061c..4803d13bca 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4281,16 +4281,18 @@ dependencies = [
[[package]]
name = "object_store"
-version = "0.13.1"
+version = "0.13.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2858065e55c148d294a9f3aae3b0fa9458edadb41a108397094566f4e3c0dfb"
+checksum = "622acbc9100d3c10e2ee15804b0caa40e55c933d5aa53814cd520805b7958a49"
dependencies = [
"async-trait",
"base64 0.22.1",
"bytes",
"chrono",
"form_urlencoded",
- "futures",
+ "futures-channel",
+ "futures-core",
+ "futures-util",
"http 1.4.0",
"http-body-util",
"humantime",
@@ -4300,7 +4302,7 @@ dependencies = [
"parking_lot",
"percent-encoding",
"quick-xml",
- "rand 0.9.2",
+ "rand 0.10.0",
"reqwest",
"ring",
"rustls-pki-types",
@@ -4846,9 +4848,9 @@ dependencies = [
[[package]]
name = "quick-xml"
-version = "0.38.4"
+version = "0.39.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b66c2058c55a409d601666cffe35f04333cf1013010882cec174a7467cd4e21c"
+checksum = "958f21e8e7ceb5a1aa7fa87fab28e7c75976e0bfe7e23ff069e0a260f894067d"
dependencies = [
"memchr",
"serde",
diff --git a/Cargo.toml b/Cargo.toml
index c6f38e16b9..64673c025d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -170,7 +170,7 @@ liblzma = { version = "0.4.6", features = ["static"] }
log = "^0.4"
memchr = "2.8.0"
num-traits = { version = "0.2" }
-object_store = { version = "0.13.1", default-features = false }
+object_store = { version = "0.13.2", default-features = false }
parking_lot = "0.12"
parquet = { version = "58.1.0", default-features = false, features = [
"arrow",
diff --git a/datafusion/core/src/datasource/physical_plan/parquet.rs b/datafusion/core/src/datasource/physical_plan/parquet.rs
index 0d1b0be906..dd8c20628b 100644
--- a/datafusion/core/src/datasource/physical_plan/parquet.rs
+++ b/datafusion/core/src/datasource/physical_plan/parquet.rs
@@ -1704,7 +1704,7 @@ mod tests {
let state = session_ctx.state();
let location = Path::from_filesystem_path(".")
.unwrap()
- .child("invalid.parquet");
+ .join("invalid.parquet");
let partitioned_file = PartitionedFile::new_from_meta(ObjectMeta {
location,
diff --git a/datafusion/core/tests/sql/path_partition.rs b/datafusion/core/tests/sql/path_partition.rs
index 1afab529f0..2eff1c262f 100644
--- a/datafusion/core/tests/sql/path_partition.rs
+++ b/datafusion/core/tests/sql/path_partition.rs
@@ -774,7 +774,7 @@ impl ObjectStore for MirroringObjectStore {
};
if parts.next().is_some() {
- common_prefixes.insert(prefix.child(common_prefix));
+ common_prefixes.insert(prefix.clone().join(common_prefix));
} else {
let object = ObjectMeta {
location: k.clone(),
diff --git a/datafusion/datasource/src/url.rs b/datafusion/datasource/src/url.rs
index f155bacbd3..88f85eb456 100644
--- a/datafusion/datasource/src/url.rs
+++ b/datafusion/datasource/src/url.rs
@@ -536,7 +536,7 @@ mod tests {
let root = root.to_string_lossy();
let url = ListingTableUrl::parse(root).unwrap();
- let child = url.prefix.child("partition").child("file");
+ let child = url.prefix.clone().join("partition").join("file");
let prefix: Vec<_> = url.strip_prefix(&child).unwrap().collect();
assert_eq!(prefix, vec!["partition", "file"]);
diff --git a/datafusion/datasource/src/write/demux.rs b/datafusion/datasource/src/write/demux.rs
index 1648624747..acc6435acf 100644
--- a/datafusion/datasource/src/write/demux.rs
+++ b/datafusion/datasource/src/write/demux.rs
@@ -260,7 +260,8 @@ fn generate_file_path(
if !single_file_output {
base_output_path
.prefix()
- .child(format!("{write_id}_{part_idx}.{file_extension}"))
+ .clone()
+ .join(format!("{write_id}_{part_idx}.{file_extension}"))
} else {
base_output_path.prefix().to_owned()
}
@@ -588,8 +589,8 @@ fn compute_hive_style_file_path(
) -> Path {
let mut file_path = base_output_path.prefix().clone();
for j in 0..part_key.len() {
- file_path = file_path.child(format!("{}={}", partition_by[j].0, part_key[j]));
+ file_path = file_path.join(format!("{}={}", partition_by[j].0, part_key[j]));
}
- file_path.child(format!("{write_id}.{file_extension}"))
+ file_path.join(format!("{write_id}.{file_extension}"))
}