diff --git a/native/Cargo.lock b/native/Cargo.lock index e0deced343f..2abb7b27ca6 100644 --- a/native/Cargo.lock +++ b/native/Cargo.lock @@ -1802,7 +1802,7 @@ dependencies = [ "object_store", "object_store_opendal", "once_cell", - "opendal", + "opendal 0.54.1", "parking_lot", "parquet", "paste", @@ -3235,7 +3235,7 @@ dependencies = [ "murmur3", "num-bigint", "once_cell", - "opendal", + "opendal 0.54.1", "ordered-float 4.6.0", "parquet", "rand 0.8.5", @@ -3473,6 +3473,47 @@ dependencies = [ "glob", ] +[[package]] +name = "jiff" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49cce2b81f2098e7e3efc35bc2e0a6b7abec9d34128283d7a26fa8f32a6dbb35" +dependencies = [ + "jiff-static", + "jiff-tzdb-platform", + "log", + "portable-atomic", + "portable-atomic-util", + "serde_core", + "windows-sys 0.61.2", +] + +[[package]] +name = "jiff-static" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "980af8b43c3ad5d8d349ace167ec8170839f753a42d233ba19e08afe1850fa69" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.110", +] + +[[package]] +name = "jiff-tzdb" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1283705eb0a21404d2bfd6eef2a7593d240bc42a0bdb39db0ad6fa2ec026524" + +[[package]] +name = "jiff-tzdb-platform" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "875a5a69ac2bab1a891711cf5eccbec1ce0341ea805560dcd90b7a2e925132e8" +dependencies = [ + "jiff-tzdb", +] + [[package]] name = "jni" version = "0.21.1" @@ -4021,15 +4062,16 @@ dependencies = [ [[package]] name = "object_store_opendal" -version = "0.54.1" +version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0b88fc0e0c4890c1d99e2b8c519c5db40f7d9b69a0f562ff1ad4967a4c8bbc6" +checksum = "113ab0769e972eee585e57407b98de08bda5354fa28e8ba4d89038d6cb6a8991" dependencies = [ "async-trait", "bytes", + "chrono", "futures", "object_store", - "opendal", + "opendal 0.55.0", "pin-project", "tokio", ] @@ -4075,6 +4117,33 @@ dependencies = [ "uuid", ] +[[package]] +name = "opendal" +version = "0.55.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d075ab8a203a6ab4bc1bce0a4b9fe486a72bf8b939037f4b78d95386384bc80a" +dependencies = [ + "anyhow", + "backon", + "base64", + "bytes", + "futures", + "getrandom 0.2.16", + "http 1.3.1", + "http-body 1.0.1", + "jiff", + "log", + "md-5", + "percent-encoding", + "quick-xml 0.38.4", + "reqwest", + "serde", + "serde_json", + "tokio", + "url", + "uuid", +] + [[package]] name = "openssl-probe" version = "0.1.6" @@ -4381,6 +4450,15 @@ version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f84267b20a16ea918e43c6a88433c2d54fa145c92a811b5b047ccbe153674483" +[[package]] +name = "portable-atomic-util" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8a2f0d8d040d7848a709caf78912debcc3f33ee4b3cac47d73d1e1069e83507" +dependencies = [ + "portable-atomic", +] + [[package]] name = "potential_utf" version = "0.1.4" diff --git a/native/core/Cargo.toml b/native/core/Cargo.toml index 139d15b0d6d..b5176d57a96 100644 --- a/native/core/Cargo.toml +++ b/native/core/Cargo.toml @@ -75,7 +75,7 @@ aws-credential-types = { workspace = true } parking_lot = "0.12.5" datafusion-comet-objectstore-hdfs = { path = "../hdfs", optional = true, default-features = false, features = ["hdfs"] } reqwest = { version = "0.12", default-features = false, features = ["rustls-tls-native-roots", "http2"] } -object_store_opendal = {version = "0.54.0", optional = true} +object_store_opendal = {version = "0.55.0", optional = true} hdfs-sys = {version = "0.3", optional = true, features = ["hdfs_3_3"]} opendal = { version ="0.54.1", optional = true, features = ["services-hdfs"] } iceberg = { workspace = true }