Skip to content

Commit 5aa7a13

Browse files
dispanserclaude
authored andcommitted
Bump object_store upper bound to 0.12.5 (#408)
* Bump object_store upper bound from 0.12.2 to 0.12.5 object_store 0.12.3-0.12.5 contain critical fixes for S3 reliability: - Fix not retrying connection errors (0.12.4, apache#445) - Don't unwrap on body send in SpawnService (0.12.4, apache#442) - Retry on HTTP 429 and 408 (0.12.3, #426) - Add Content-Length to S3 create_multipart (0.12.4, apache#496) Co-Authored-By: Claude Opus 4.6 <[email protected]> * Update Cargo.lock for object_store 0.12.5 Co-Authored-By: Claude Opus 4.6 <[email protected]> --------- Co-authored-by: Claude Opus 4.6 <[email protected]>
1 parent 632c68f commit 5aa7a13

7 files changed

Lines changed: 19 additions & 19 deletions

File tree

‎Cargo.lock‎

Lines changed: 7 additions & 7 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
@@ -155,7 +155,7 @@ hashbrown = { version = "0.14.5", features = ["raw"] }
155155
indexmap = ">=2.5.0, <=2.12.0"
156156
itertools = "0.14"
157157
log = "^0.4"
158-
object_store = { version = ">=0.12.0, <=0.12.2", default-features = false }
158+
object_store = { version = ">=0.12.0, <=0.12.5", default-features = false }
159159
parking_lot = "0.12"
160160
parquet = { git = "https://github.com/Coralogix/arrow-rs.git", rev = "147b6d00c2", default-features = false, features = [
161161
"arrow",

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ mod tests {
6262
use object_store::path::Path;
6363
use object_store::{
6464
Attributes, GetOptions, GetResult, GetResultPayload, ListResult, MultipartUpload,
65-
ObjectMeta, ObjectStore, PutMultipartOpts, PutOptions, PutPayload, PutResult,
65+
ObjectMeta, ObjectStore, PutMultipartOptions, PutOptions, PutPayload, PutResult,
6666
};
6767
use regex::Regex;
6868
use rstest::*;
@@ -96,7 +96,7 @@ mod tests {
9696
async fn put_multipart_opts(
9797
&self,
9898
_location: &Path,
99-
_opts: PutMultipartOpts,
99+
_opts: PutMultipartOptions,
100100
) -> object_store::Result<Box<dyn MultipartUpload>> {
101101
unimplemented!()
102102
}

‎datafusion/core/src/datasource/file_format/parquet.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ mod tests {
158158
use object_store::ObjectMeta;
159159
use object_store::{
160160
path::Path, GetOptions, GetResult, ListResult, MultipartUpload, ObjectStore,
161-
PutMultipartOpts, PutOptions, PutPayload, PutResult,
161+
PutMultipartOptions, PutOptions, PutPayload, PutResult,
162162
};
163163
use parquet::arrow::arrow_reader::ArrowReaderOptions;
164164
use parquet::arrow::ParquetRecordBatchStreamBuilder;
@@ -309,7 +309,7 @@ mod tests {
309309
async fn put_multipart_opts(
310310
&self,
311311
_location: &Path,
312-
_opts: PutMultipartOpts,
312+
_opts: PutMultipartOptions,
313313
) -> object_store::Result<Box<dyn MultipartUpload>> {
314314
Err(object_store::Error::NotImplemented)
315315
}

‎datafusion/core/src/test/object_store.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ use futures::stream::BoxStream;
2424
use futures::FutureExt;
2525
use object_store::{
2626
memory::InMemory, path::Path, Error, GetOptions, GetResult, ListResult,
27-
MultipartUpload, ObjectMeta, ObjectStore, PutMultipartOpts, PutOptions, PutPayload,
28-
PutResult,
27+
MultipartUpload, ObjectMeta, ObjectStore, PutMultipartOptions, PutOptions,
28+
PutPayload, PutResult,
2929
};
3030
use std::fmt::{Debug, Display, Formatter};
3131
use std::sync::Arc;
@@ -118,7 +118,7 @@ impl ObjectStore for BlockingObjectStore {
118118
async fn put_multipart_opts(
119119
&self,
120120
location: &Path,
121-
opts: PutMultipartOpts,
121+
opts: PutMultipartOptions,
122122
) -> object_store::Result<Box<dyn MultipartUpload>> {
123123
self.inner.put_multipart_opts(location, opts).await
124124
}

‎datafusion/core/tests/sql/path_partition.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ use object_store::{
5050
path::Path, GetOptions, GetResult, GetResultPayload, ListResult, ObjectMeta,
5151
ObjectStore, PutOptions, PutResult,
5252
};
53-
use object_store::{Attributes, MultipartUpload, PutMultipartOpts, PutPayload};
53+
use object_store::{Attributes, MultipartUpload, PutMultipartOptions, PutPayload};
5454
use url::Url;
5555

5656
#[tokio::test]
@@ -645,7 +645,7 @@ impl ObjectStore for MirroringObjectStore {
645645
async fn put_multipart_opts(
646646
&self,
647647
_location: &Path,
648-
_opts: PutMultipartOpts,
648+
_opts: PutMultipartOptions,
649649
) -> object_store::Result<Box<dyn MultipartUpload>> {
650650
unimplemented!()
651651
}

‎datafusion/core/tests/tracing/traceable_object_store.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ use crate::tracing::asserting_tracer::assert_traceability;
2121
use futures::stream::BoxStream;
2222
use object_store::{
2323
path::Path, GetOptions, GetResult, ListResult, MultipartUpload, ObjectMeta,
24-
ObjectStore, PutMultipartOpts, PutOptions, PutPayload, PutResult,
24+
ObjectStore, PutMultipartOptions, PutOptions, PutPayload, PutResult,
2525
};
2626
use std::fmt::{Debug, Display, Formatter};
2727
use std::sync::Arc;
@@ -68,7 +68,7 @@ impl ObjectStore for TraceableObjectStore {
6868
async fn put_multipart_opts(
6969
&self,
7070
location: &Path,
71-
opts: PutMultipartOpts,
71+
opts: PutMultipartOptions,
7272
) -> object_store::Result<Box<dyn MultipartUpload>> {
7373
assert_traceability().await;
7474
self.inner.put_multipart_opts(location, opts).await

0 commit comments

Comments
 (0)