diff --git a/Cargo.lock b/Cargo.lock index 5b91e933f8c..2c8d0976a98 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -978,7 +978,7 @@ dependencies = [ "itertools 0.12.1", "metric", "non-empty-string", - "object_store", + "object_store 0.9.0", "observability_deps", "parquet_cache", "snafu 0.8.0", @@ -1478,7 +1478,7 @@ dependencies = [ "itertools 0.12.1", "log", "num_cpus", - "object_store", + "object_store 0.8.0", "parking_lot 0.12.1", "parquet", "pin-project-lite", @@ -1507,7 +1507,7 @@ dependencies = [ "half", "libc", "num_cpus", - "object_store", + "object_store 0.8.0", "parquet", "sqlparser", ] @@ -1525,7 +1525,7 @@ dependencies = [ "futures", "hashbrown 0.14.3", "log", - "object_store", + "object_store 0.8.0", "parking_lot 0.12.1", "rand", "tempfile", @@ -1637,7 +1637,7 @@ dependencies = [ "datafusion", "datafusion-common", "datafusion-expr", - "object_store", + "object_store 0.8.0", "prost 0.12.3", ] @@ -1661,7 +1661,7 @@ dependencies = [ "async-trait", "datafusion", "futures", - "object_store", + "object_store 0.9.0", "observability_deps", "pin-project", "schema", @@ -2510,7 +2510,7 @@ dependencies = [ "generated_types", "influxdb_iox_client", "iox_catalog", - "object_store", + "object_store 0.9.0", "observability_deps", "parquet_file", "schema", @@ -2607,7 +2607,7 @@ dependencies = [ "libc", "metric", "num_cpus", - "object_store", + "object_store 0.9.0", "observability_deps", "once_cell", "panic_logging", @@ -2651,7 +2651,7 @@ dependencies = [ "iox_time", "metric", "metric_exporters", - "object_store", + "object_store 0.9.0", "observability_deps", "parking_lot 0.11.2", "parquet_file", @@ -2692,7 +2692,7 @@ dependencies = [ "influxdb-line-protocol", "iox_catalog", "iox_query", - "object_store", + "object_store 0.9.0", "observability_deps", "parking_lot 0.11.2", "parquet", @@ -2956,7 +2956,7 @@ dependencies = [ "iox_time", "itertools 0.12.1", "metric", - "object_store", + "object_store 0.9.0", "observability_deps", "once_cell", "parking_lot 0.12.1", @@ -3053,7 +3053,7 @@ dependencies = [ "iox_time", "metric", "mutable_batch_lp", - "object_store", + "object_store 0.9.0", "observability_deps", "parquet_file", "schema", @@ -3293,7 +3293,7 @@ dependencies = [ "pem", "pin-project", "rustls", - "rustls-pemfile", + "rustls-pemfile 1.0.4", "secrecy", "serde", "serde_json", @@ -3970,6 +3970,27 @@ name = "object_store" version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2524735495ea1268be33d200e1ee97455096a0846295a21548cd2f3541de7050" +dependencies = [ + "async-trait", + "bytes", + "chrono", + "futures", + "humantime", + "itertools 0.11.0", + "parking_lot 0.12.1", + "percent-encoding", + "snafu 0.7.5", + "tokio", + "tracing", + "url", + "walkdir", +] + +[[package]] +name = "object_store" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d139f545f64630e2e3688fd9f81c470888ab01edeb72d13b4e86c566f1130000" dependencies = [ "async-trait", "base64", @@ -3978,14 +3999,14 @@ dependencies = [ "futures", "humantime", "hyper", - "itertools 0.11.0", + "itertools 0.12.1", "parking_lot 0.12.1", "percent-encoding", "quick-xml 0.31.0", "rand", "reqwest", "ring", - "rustls-pemfile", + "rustls-pemfile 2.0.0", "serde", "serde_json", "snafu 0.7.5", @@ -4004,7 +4025,7 @@ dependencies = [ "futures", "iox_time", "metric", - "object_store", + "object_store 0.9.0", "pin-project", "snafu 0.8.0", "tokio", @@ -4177,7 +4198,7 @@ dependencies = [ "lz4_flex", "num", "num-bigint", - "object_store", + "object_store 0.8.0", "paste", "seq-macro", "snap", @@ -4214,7 +4235,7 @@ dependencies = [ "moka", "mpchash", "notify", - "object_store", + "object_store 0.9.0", "observability_deps", "parking_lot 0.12.1", "parquet_file", @@ -4249,7 +4270,7 @@ dependencies = [ "futures", "generated_types", "iox_time", - "object_store", + "object_store 0.9.0", "observability_deps", "parquet", "pbjson-types", @@ -4276,7 +4297,7 @@ dependencies = [ "influxdb-line-protocol", "mutable_batch_lp", "num_cpus", - "object_store", + "object_store 0.9.0", "parquet_file", "schema", "snafu 0.8.0", @@ -5021,7 +5042,7 @@ dependencies = [ "pin-project-lite", "rustls", "rustls-native-certs", - "rustls-pemfile", + "rustls-pemfile 1.0.4", "serde", "serde_json", "serde_urlencoded", @@ -5130,7 +5151,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00" dependencies = [ "openssl-probe", - "rustls-pemfile", + "rustls-pemfile 1.0.4", "schannel", "security-framework", ] @@ -5144,6 +5165,22 @@ dependencies = [ "base64", ] +[[package]] +name = "rustls-pemfile" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35e4980fa29e4c4b212ffb3db068a564cbf560e51d3944b7c88bd8bf5bec64f4" +dependencies = [ + "base64", + "rustls-pki-types", +] + +[[package]] +name = "rustls-pki-types" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a716eb65e3158e90e17cd93d855216e27bde02745ab842f2cab4a39dba1bacf" + [[package]] name = "rustls-webpki" version = "0.101.7" @@ -5698,7 +5735,7 @@ dependencies = [ "paste", "percent-encoding", "rustls", - "rustls-pemfile", + "rustls-pemfile 1.0.4", "serde", "serde_json", "sha2", @@ -6399,7 +6436,7 @@ dependencies = [ "prost 0.12.3", "rustls", "rustls-native-certs", - "rustls-pemfile", + "rustls-pemfile 1.0.4", "tokio", "tokio-rustls", "tokio-stream", @@ -7277,7 +7314,7 @@ dependencies = [ "nix 0.27.1", "nom", "num-traits", - "object_store", + "object_store 0.9.0", "once_cell", "parking_lot 0.12.1", "percent-encoding", diff --git a/Cargo.toml b/Cargo.toml index 3094e83cc7b..26f7a94ca4f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -104,7 +104,7 @@ arrow-flight = { version = "49.0.0", features = ["flight-sql-experimental"] } datafusion = { git = "https://github.com/apache/arrow-datafusion.git", rev = "0e53c6d816f3a9d3d27c6ebb6d25b1699e5553e7" } datafusion-proto = { git = "https://github.com/apache/arrow-datafusion.git", rev = "0e53c6d816f3a9d3d27c6ebb6d25b1699e5553e7" } hashbrown = { version = "0.14.3" } -object_store = { version = "0.8.0" } +object_store = { version = "0.9.0" } parquet = { version = "49.0.0", features = ["object_store"] } pbjson = { version = "0.6.0" } pbjson-build = { version = "0.6.2" } diff --git a/workspace-hack/Cargo.toml b/workspace-hack/Cargo.toml index 509cd763ff6..bb2e4e06ddf 100644 --- a/workspace-hack/Cargo.toml +++ b/workspace-hack/Cargo.toml @@ -54,7 +54,7 @@ md-5 = { version = "0.10" } memchr = { version = "2" } nom = { version = "7" } num-traits = { version = "0.2", features = ["i128", "libm"] } -object_store = { version = "0.8", default-features = false, features = ["aws", "azure", "gcp"] } +object_store = { version = "0.9", default-features = false, features = ["aws", "azure", "gcp"] } once_cell = { version = "1", features = ["parking_lot"] } parking_lot = { version = "0.12", features = ["arc_lock"] } percent-encoding = { version = "2" }