Skip to content

Commit e5358b7

Browse files
dependabot[bot]compheadalamb
authored
chore(deps): bump object_store from 0.13.1 to 0.13.2 (apache#21275)
Bumps [object_store](https://github.com/apache/arrow-rs-object-store) from 0.13.1 to 0.13.2. <details> <summary>Changelog</summary> <p><em>Sourced from <a href="https://github.com/apache/arrow-rs-object-store/blob/main/CHANGELOG-old.md">object_store's changelog</a>.</em></p> <blockquote> <!-- raw HTML omitted --> <h1>Historical Changelog</h1> </blockquote> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/apache/arrow-rs-object-store/commit/7a65b75b0d26fd8a282999462cb7030fb85fdcc3"><code>7a65b75</code></a> chore: prepare <code>0.13.2</code> release (<a href="https://redirect.github.com/apache/arrow-rs-object-store/issues/671">#671</a>)</li> <li><a href="https://github.com/apache/arrow-rs-object-store/commit/d22f7f91d576ab7b2a12750751a76d30018cb12d"><code>d22f7f9</code></a> fix: missing 5xx error body when retry exhausted (<a href="https://redirect.github.com/apache/arrow-rs-object-store/issues/618">#618</a>)</li> <li><a href="https://github.com/apache/arrow-rs-object-store/commit/ebaee78c8bd05235b4ceb2a5125a125faae5da86"><code>ebaee78</code></a> Support --xa-s3 suffix for S3 Express One Zone bucket access points (<a href="https://redirect.github.com/apache/arrow-rs-object-store/issues/663">#663</a>)</li> <li><a href="https://github.com/apache/arrow-rs-object-store/commit/7ded938312299ccc1ca517e34fe34326d8426ebb"><code>7ded938</code></a> Replace <code>Path::child</code> with <code>Path::join</code> (<a href="https://redirect.github.com/apache/arrow-rs-object-store/issues/666">#666</a>)</li> <li><a href="https://github.com/apache/arrow-rs-object-store/commit/bdcac43fc637ac89cc80f18f4e16b3fb66fd0ec8"><code>bdcac43</code></a> feat: Add support for AWS_ENDPOINT_URL_S3 environment variable (<a href="https://redirect.github.com/apache/arrow-rs-object-store/issues/590">#590</a>)</li> <li><a href="https://github.com/apache/arrow-rs-object-store/commit/ca15c63f652e1c5c2e776231ae77d08bb46375ea"><code>ca15c63</code></a> Implement Clone for local and memory stores (<a href="https://redirect.github.com/apache/arrow-rs-object-store/issues/653">#653</a>)</li> <li><a href="https://github.com/apache/arrow-rs-object-store/commit/41d32428cd625e4b86d3411b4f06a0dff7ecab47"><code>41d3242</code></a> docs: clarify <code>Clone</code> behavior (<a href="https://redirect.github.com/apache/arrow-rs-object-store/issues/656">#656</a>)</li> <li><a href="https://github.com/apache/arrow-rs-object-store/commit/62592027cb7d33ed843bc14fb77d7fc32f13ace5"><code>6259202</code></a> Unify <code>from_env</code> behaviours (<a href="https://redirect.github.com/apache/arrow-rs-object-store/issues/652">#652</a>)</li> <li><a href="https://github.com/apache/arrow-rs-object-store/commit/66e640d1ba7b79d878e9423924ed5bff4f321b75"><code>66e640d</code></a> Switch TokenCache to RWLock (<a href="https://redirect.github.com/apache/arrow-rs-object-store/issues/648">#648</a>)</li> <li><a href="https://github.com/apache/arrow-rs-object-store/commit/907653e46232edb3a635969bf288324b68d62cdc"><code>907653e</code></a> docs: add examples to the aws docs where appropriate (<a href="https://redirect.github.com/apache/arrow-rs-object-store/issues/651">#651</a>)</li> <li>Additional commits viewable in <a href="https://github.com/apache/arrow-rs-object-store/compare/v0.13.1...v0.13.2">compare view</a></li> </ul> </details> <br /> --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Oleks V <comphead@users.noreply.github.com> Co-authored-by: Andrew Lamb <andrew@nerdnetworks.org>
1 parent a767511 commit e5358b7

File tree

6 files changed

+16
-13
lines changed

6 files changed

+16
-13
lines changed

Cargo.lock

Lines changed: 8 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ liblzma = { version = "0.4.6", features = ["static"] }
170170
log = "^0.4"
171171
memchr = "2.8.0"
172172
num-traits = { version = "0.2" }
173-
object_store = { version = "0.13.1", default-features = false }
173+
object_store = { version = "0.13.2", default-features = false }
174174
parking_lot = "0.12"
175175
parquet = { version = "58.1.0", default-features = false, features = [
176176
"arrow",

datafusion/core/src/datasource/physical_plan/parquet.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1704,7 +1704,7 @@ mod tests {
17041704
let state = session_ctx.state();
17051705
let location = Path::from_filesystem_path(".")
17061706
.unwrap()
1707-
.child("invalid.parquet");
1707+
.join("invalid.parquet");
17081708

17091709
let partitioned_file = PartitionedFile::new_from_meta(ObjectMeta {
17101710
location,

datafusion/core/tests/sql/path_partition.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -774,7 +774,7 @@ impl ObjectStore for MirroringObjectStore {
774774
};
775775

776776
if parts.next().is_some() {
777-
common_prefixes.insert(prefix.child(common_prefix));
777+
common_prefixes.insert(prefix.clone().join(common_prefix));
778778
} else {
779779
let object = ObjectMeta {
780780
location: k.clone(),

datafusion/datasource/src/url.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -536,7 +536,7 @@ mod tests {
536536
let root = root.to_string_lossy();
537537

538538
let url = ListingTableUrl::parse(root).unwrap();
539-
let child = url.prefix.child("partition").child("file");
539+
let child = url.prefix.clone().join("partition").join("file");
540540

541541
let prefix: Vec<_> = url.strip_prefix(&child).unwrap().collect();
542542
assert_eq!(prefix, vec!["partition", "file"]);

datafusion/datasource/src/write/demux.rs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,8 @@ fn generate_file_path(
260260
if !single_file_output {
261261
base_output_path
262262
.prefix()
263-
.child(format!("{write_id}_{part_idx}.{file_extension}"))
263+
.clone()
264+
.join(format!("{write_id}_{part_idx}.{file_extension}"))
264265
} else {
265266
base_output_path.prefix().to_owned()
266267
}
@@ -588,8 +589,8 @@ fn compute_hive_style_file_path(
588589
) -> Path {
589590
let mut file_path = base_output_path.prefix().clone();
590591
for j in 0..part_key.len() {
591-
file_path = file_path.child(format!("{}={}", partition_by[j].0, part_key[j]));
592+
file_path = file_path.join(format!("{}={}", partition_by[j].0, part_key[j]));
592593
}
593594

594-
file_path.child(format!("{write_id}.{file_extension}"))
595+
file_path.join(format!("{write_id}.{file_extension}"))
595596
}

0 commit comments

Comments
 (0)