Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion columnq/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ path = "src/lib.rs"
arrow-schema = { version ="26", features = ["serde"] }

datafusion = "14"
object_store = "0.5.0"
object_store = { version = "0.5.3", features = ["aws_profile"] }
Copy link
Collaborator Author

@jychen7 jychen7 Jan 19, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the feature aws_profile was introduced since 0.5.2. I set minimum to 0.5.3 as it is latest one as of today and helps remove simplify code a bit in columnq/src/columnq.rs
https://github.com/apache/arrow-rs/blob/master/object_store/CHANGELOG-old.md#object_store_052-2022-12-02

ps: Cargo.lock already use 0.5.3 anyway

roapi/Cargo.lock

Lines 2794 to 2796 in bd168d9

[[package]]
name = "object_store"
version = "0.5.3"

url = "2.2"

log = "0"
Expand Down
6 changes: 0 additions & 6 deletions columnq/src/columnq.rs
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,6 @@ impl ObjectStoreProvider for ColumnQObjectStoreProvider {
// for minio in CI
s3_builder = s3_builder.with_allow_http(true);

// TODO: can remove "with_endpoint" after object_store upgrade to 0.5.3
// https://github.com/apache/arrow-datafusion/pull/4929
if let Ok(endpoint) = std::env::var("AWS_ENDPOINT_URL") {
s3_builder = s3_builder.with_endpoint(endpoint);
}

match s3_builder.build() {
Ok(s3) => Ok(Arc::new(s3)),
Err(err) => Err(DataFusionError::External(Box::new(err))),
Expand Down