chore: use opendal main branch (#8118)

* chore: use opendal main branch

Signed-off-by: shuiyisong <xixing.sys@gmail.com>

* fix: fmt

Signed-off-by: shuiyisong <xixing.sys@gmail.com>

---------

Signed-off-by: shuiyisong <xixing.sys@gmail.com>
This commit is contained in:
shuiyisong
2026-05-16 07:01:50 +08:00
committed by GitHub
parent 3cbd15c1a9
commit fafa677012
4 changed files with 168 additions and 136 deletions

287
Cargo.lock generated
View File

@@ -29,7 +29,7 @@ version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d122413f284cf2d62fb1b7db97e02edb8cda96d769b16e443a4f6195e35662b0"
dependencies = [
"crypto-common",
"crypto-common 0.1.6",
"generic-array",
]
@@ -56,7 +56,7 @@ dependencies = [
"cmac",
"ctr",
"dbl",
"digest",
"digest 0.10.7",
"zeroize",
]
@@ -945,7 +945,7 @@ dependencies = [
"common-macro",
"common-telemetry",
"common-test-util",
"digest",
"digest 0.10.7",
"sha1",
"snafu 0.8.6",
"sql",
@@ -1346,7 +1346,7 @@ version = "0.10.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "46502ad458c9a52b69d4d4d32775c788b7a1b85e8bc9d482d92250fc0e3f8efe"
dependencies = [
"digest",
"digest 0.10.7",
]
[[package]]
@@ -1371,6 +1371,15 @@ dependencies = [
"generic-array",
]
[[package]]
name = "block-buffer"
version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cdd35008169921d80bc60d3d0ab416eecb028c4cd653352907921d95084790be"
dependencies = [
"hybrid-array",
]
[[package]]
name = "block-padding"
version = "0.3.3"
@@ -1867,7 +1876,7 @@ version = "0.4.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad"
dependencies = [
"crypto-common",
"crypto-common 0.1.6",
"inout",
"zeroize",
]
@@ -2041,7 +2050,7 @@ checksum = "8543454e3c3f5126effff9cd44d562af4e31fb8ce1cc0d3dcd8f084515dbc1aa"
dependencies = [
"cipher",
"dbl",
"digest",
"digest 0.10.7",
]
[[package]]
@@ -3016,6 +3025,12 @@ version = "0.9.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8"
[[package]]
name = "const-oid"
version = "0.10.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a6ef517f0926dd24a1582492c791b6a4818a4d94e789a334894aa15b0d12f55c"
[[package]]
name = "const-random"
version = "0.1.18"
@@ -3327,6 +3342,15 @@ dependencies = [
"typenum",
]
[[package]]
name = "crypto-common"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "77727bb15fa921304124b128af125e7e3b968275d1b108b379190264f4423710"
dependencies = [
"hybrid-array",
]
[[package]]
name = "crypto_secretbox"
version = "0.1.1"
@@ -3365,20 +3389,14 @@ dependencies = [
[[package]]
name = "ctor"
version = "0.6.3"
version = "1.0.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "424e0138278faeb2b401f174ad17e715c829512d74f3d1e81eb43365c2e0590e"
checksum = "378f0974ae2468eaf63aa036dbe9c926b0dc7ea64c156f2ea618bc2f75b934f0"
dependencies = [
"ctor-proc-macro",
"dtor",
"link-section",
"linktime-proc-macro",
]
[[package]]
name = "ctor-proc-macro"
version = "0.0.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "52560adf09603e58c9a7ee1fe1dcb95a16927b17c127f0ac02d6e768a0e25bc1"
[[package]]
name = "ctr"
version = "0.9.2"
@@ -3922,12 +3940,12 @@ dependencies = [
"hex",
"itertools 0.14.0",
"log",
"md-5",
"md-5 0.10.6",
"memchr",
"num-traits",
"rand 0.9.1",
"regex",
"sha2",
"sha2 0.10.9",
"unicode-segmentation",
"uuid",
]
@@ -4457,7 +4475,7 @@ version = "0.7.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e7c1832837b905bbfb5101e07cc24c8deddf52f93225eee6ead5f4d63d53ddcb"
dependencies = [
"const-oid",
"const-oid 0.9.6",
"pem-rfc7468",
"zeroize",
]
@@ -4643,12 +4661,23 @@ version = "0.10.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
dependencies = [
"block-buffer",
"const-oid",
"crypto-common",
"block-buffer 0.10.4",
"const-oid 0.9.6",
"crypto-common 0.1.6",
"subtle",
]
[[package]]
name = "digest"
version = "0.11.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f1dd6dbb5841937940781866fa1281a1ff7bd3bf827091440879f9994983d5c2"
dependencies = [
"block-buffer 0.12.0",
"const-oid 0.10.2",
"crypto-common 0.2.1",
]
[[package]]
name = "displaydoc"
version = "0.2.5"
@@ -4759,21 +4788,6 @@ version = "2.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ea8a8b81cacc08888170eef4d13b775126db426d0b348bee9d18c2c1eaf123cf"
[[package]]
name = "dtor"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "404d02eeb088a82cfd873006cb713fe411306c7d182c344905e101fb1167d301"
dependencies = [
"dtor-proc-macro",
]
[[package]]
name = "dtor-proc-macro"
version = "0.0.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f678cf4a922c215c63e0de95eb1ff08a958a81d47e485cf9da1e27bf6305cfa5"
[[package]]
name = "dunce"
version = "1.0.5"
@@ -6058,7 +6072,7 @@ version = "0.12.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e"
dependencies = [
"digest",
"digest 0.10.7",
]
[[package]]
@@ -6204,6 +6218,15 @@ dependencies = [
"serde",
]
[[package]]
name = "hybrid-array"
version = "0.4.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3944cf8cf766b40e2a1a333ee5e9b563f854d5fa49d6a8ca2764e97c6eddb214"
dependencies = [
"typenum",
]
[[package]]
name = "hyper"
version = "0.14.32"
@@ -7582,12 +7605,24 @@ dependencies = [
"cc",
]
[[package]]
name = "link-section"
version = "0.16.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5c8600ca3dbe044f07955b443ff606c50f45295b863289bbe7d0844d50cf11e4"
[[package]]
name = "linked-hash-map"
version = "0.5.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f"
[[package]]
name = "linktime-proc-macro"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a44cd706ff0d503ee32b2071166510ca27e281228de10cd3aa8d35ff94560f81"
[[package]]
name = "linux-raw-sys"
version = "0.4.15"
@@ -7891,7 +7926,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf"
dependencies = [
"cfg-if",
"digest",
"digest 0.10.7",
]
[[package]]
name = "md-5"
version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "69b6441f590336821bb897fb28fc622898ccceb1d6cea3fde5ea86b090c4de98"
dependencies = [
"cfg-if",
"digest 0.11.3",
]
[[package]]
@@ -8504,7 +8549,7 @@ dependencies = [
"serde",
"serde_json",
"sha1",
"sha2",
"sha2 0.10.9",
"smallvec",
"subprocess",
"thiserror 1.0.69",
@@ -8538,7 +8583,7 @@ dependencies = [
"serde",
"serde_json",
"sha1",
"sha2",
"sha2 0.10.9",
"subprocess",
"thiserror 1.0.69",
"time",
@@ -8995,8 +9040,7 @@ dependencies = [
[[package]]
name = "object_store_opendal"
version = "0.56.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "08298874eee5935c95bcaa393148834f9c53d904461ca15584a041d8a1c907c2"
source = "git+https://github.com/apache/opendal.git?rev=4ad2d85296ffa6fdc2882f97d3c760ee243913f7#4ad2d85296ffa6fdc2882f97d3c760ee243913f7"
dependencies = [
"async-trait",
"bytes",
@@ -9084,8 +9128,7 @@ checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381"
[[package]]
name = "opendal"
version = "0.56.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "97b31d3d8e99a85d83b73ec26647f5607b80578ed9375810b6e44ffa3590a236"
source = "git+https://github.com/apache/opendal.git?rev=4ad2d85296ffa6fdc2882f97d3c760ee243913f7#4ad2d85296ffa6fdc2882f97d3c760ee243913f7"
dependencies = [
"ctor",
"opendal-core",
@@ -9106,8 +9149,7 @@ dependencies = [
[[package]]
name = "opendal-core"
version = "0.56.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1849dd2687e173e776d3af5fce1ba3ae47b9dd37a09d1c4deba850ef45fe00ca"
source = "git+https://github.com/apache/opendal.git?rev=4ad2d85296ffa6fdc2882f97d3c760ee243913f7#4ad2d85296ffa6fdc2882f97d3c760ee243913f7"
dependencies = [
"anyhow",
"base64 0.22.1",
@@ -9117,10 +9159,10 @@ dependencies = [
"http-body 1.0.1",
"jiff",
"log",
"md-5",
"md-5 0.11.0",
"mea",
"percent-encoding",
"quick-xml 0.38.4",
"quick-xml 0.39.4",
"reqsign-core",
"reqwest 0.13.2",
"serde",
@@ -9134,8 +9176,7 @@ dependencies = [
[[package]]
name = "opendal-layer-concurrent-limit"
version = "0.56.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "048b1b29c503263bdd80a9afe46a68cd02ea9bd361185b1feab4b151078998e9"
source = "git+https://github.com/apache/opendal.git?rev=4ad2d85296ffa6fdc2882f97d3c760ee243913f7#4ad2d85296ffa6fdc2882f97d3c760ee243913f7"
dependencies = [
"futures",
"http 1.3.1",
@@ -9146,8 +9187,7 @@ dependencies = [
[[package]]
name = "opendal-layer-logging"
version = "0.56.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d2645adc988b12eda106e2679ae529facfbbaa868ceb706f6f8125c6af15c47b"
source = "git+https://github.com/apache/opendal.git?rev=4ad2d85296ffa6fdc2882f97d3c760ee243913f7#4ad2d85296ffa6fdc2882f97d3c760ee243913f7"
dependencies = [
"log",
"opendal-core",
@@ -9156,8 +9196,7 @@ dependencies = [
[[package]]
name = "opendal-layer-observe-metrics-common"
version = "0.56.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9130f0ac11569edc0f70b0e64078b9a12e37a128849d27ea62b0ca7568e8eb97"
source = "git+https://github.com/apache/opendal.git?rev=4ad2d85296ffa6fdc2882f97d3c760ee243913f7#4ad2d85296ffa6fdc2882f97d3c760ee243913f7"
dependencies = [
"futures",
"http 1.3.1",
@@ -9167,8 +9206,7 @@ dependencies = [
[[package]]
name = "opendal-layer-prometheus"
version = "0.56.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "eef98056f8198b5053005e1fbe7d163562f56d9f3be1b73a3792667e7cbaf7be"
source = "git+https://github.com/apache/opendal.git?rev=4ad2d85296ffa6fdc2882f97d3c760ee243913f7#4ad2d85296ffa6fdc2882f97d3c760ee243913f7"
dependencies = [
"opendal-core",
"opendal-layer-observe-metrics-common",
@@ -9178,8 +9216,7 @@ dependencies = [
[[package]]
name = "opendal-layer-retry"
version = "0.56.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4eac134ffa4ddda6131a640a84a5315996424b9416c85052f8c64c1a33b70ad4"
source = "git+https://github.com/apache/opendal.git?rev=4ad2d85296ffa6fdc2882f97d3c760ee243913f7#4ad2d85296ffa6fdc2882f97d3c760ee243913f7"
dependencies = [
"backon",
"log",
@@ -9189,8 +9226,7 @@ dependencies = [
[[package]]
name = "opendal-layer-timeout"
version = "0.56.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "619586ab7480c2e3009f6d18eabab18957bc094778fd130bcc38924970a90f4c"
source = "git+https://github.com/apache/opendal.git?rev=4ad2d85296ffa6fdc2882f97d3c760ee243913f7#4ad2d85296ffa6fdc2882f97d3c760ee243913f7"
dependencies = [
"opendal-core",
"tokio",
@@ -9199,8 +9235,7 @@ dependencies = [
[[package]]
name = "opendal-layer-tracing"
version = "0.56.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f569b1cfae56851662e0db0e2d8df2f417d40aa281536c13f0c5211e7b56cd6f"
source = "git+https://github.com/apache/opendal.git?rev=4ad2d85296ffa6fdc2882f97d3c760ee243913f7#4ad2d85296ffa6fdc2882f97d3c760ee243913f7"
dependencies = [
"futures",
"http 1.3.1",
@@ -9211,8 +9246,7 @@ dependencies = [
[[package]]
name = "opendal-service-azblob"
version = "0.56.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7452bf3ec61cfd81ac9ad9ada17825931e9e371d44a045c6bfab9596c0a2ac3b"
source = "git+https://github.com/apache/opendal.git?rev=4ad2d85296ffa6fdc2882f97d3c760ee243913f7#4ad2d85296ffa6fdc2882f97d3c760ee243913f7"
dependencies = [
"base64 0.22.1",
"bytes",
@@ -9220,20 +9254,19 @@ dependencies = [
"log",
"opendal-core",
"opendal-service-azure-common",
"quick-xml 0.38.4",
"quick-xml 0.39.4",
"reqsign-azure-storage",
"reqsign-core",
"reqsign-file-read-tokio",
"serde",
"sha2",
"sha2 0.11.0",
"uuid",
]
[[package]]
name = "opendal-service-azure-common"
version = "0.56.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ffb0e45d6c8dcf66ce2da20e241bcb80e6e540e109a4ff20f318f6c9b4c54e0c"
source = "git+https://github.com/apache/opendal.git?rev=4ad2d85296ffa6fdc2882f97d3c760ee243913f7#4ad2d85296ffa6fdc2882f97d3c760ee243913f7"
dependencies = [
"http 1.3.1",
"opendal-core",
@@ -9242,8 +9275,7 @@ dependencies = [
[[package]]
name = "opendal-service-fs"
version = "0.56.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cf0be0417abeeb0053376d816b90fceb9ca98f20dfb54ebf1f2a282729f83663"
source = "git+https://github.com/apache/opendal.git?rev=4ad2d85296ffa6fdc2882f97d3c760ee243913f7#4ad2d85296ffa6fdc2882f97d3c760ee243913f7"
dependencies = [
"bytes",
"log",
@@ -9256,8 +9288,7 @@ dependencies = [
[[package]]
name = "opendal-service-gcs"
version = "0.56.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "70a49477a10163431896d106136117f5670717f9c9e49cf6f710528800c6633a"
source = "git+https://github.com/apache/opendal.git?rev=4ad2d85296ffa6fdc2882f97d3c760ee243913f7#4ad2d85296ffa6fdc2882f97d3c760ee243913f7"
dependencies = [
"async-trait",
"bytes",
@@ -9265,7 +9296,7 @@ dependencies = [
"log",
"opendal-core",
"percent-encoding",
"quick-xml 0.38.4",
"quick-xml 0.39.4",
"reqsign-core",
"reqsign-file-read-tokio",
"reqsign-google",
@@ -9277,8 +9308,7 @@ dependencies = [
[[package]]
name = "opendal-service-http"
version = "0.56.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6fe73e6978feec293acfb92bfa94bdb9cf1b5be3f7c3f93a4333a25455826005"
source = "git+https://github.com/apache/opendal.git?rev=4ad2d85296ffa6fdc2882f97d3c760ee243913f7#4ad2d85296ffa6fdc2882f97d3c760ee243913f7"
dependencies = [
"http 1.3.1",
"log",
@@ -9289,14 +9319,13 @@ dependencies = [
[[package]]
name = "opendal-service-oss"
version = "0.56.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "29c8a917829ad06d21b639558532cb0101fe49b040d946d673a73018683fac05"
source = "git+https://github.com/apache/opendal.git?rev=4ad2d85296ffa6fdc2882f97d3c760ee243913f7#4ad2d85296ffa6fdc2882f97d3c760ee243913f7"
dependencies = [
"bytes",
"http 1.3.1",
"log",
"opendal-core",
"quick-xml 0.38.4",
"quick-xml 0.39.4",
"reqsign-aliyun-oss",
"reqsign-core",
"reqsign-file-read-tokio",
@@ -9306,17 +9335,16 @@ dependencies = [
[[package]]
name = "opendal-service-s3"
version = "0.56.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9dadddeb9bb50b0d30927dd914c298c4ddca47e4c1cfa7674d311f0cf9b051c8"
source = "git+https://github.com/apache/opendal.git?rev=4ad2d85296ffa6fdc2882f97d3c760ee243913f7#4ad2d85296ffa6fdc2882f97d3c760ee243913f7"
dependencies = [
"base64 0.22.1",
"bytes",
"crc32c",
"http 1.3.1",
"log",
"md-5",
"md-5 0.11.0",
"opendal-core",
"quick-xml 0.38.4",
"quick-xml 0.39.4",
"reqsign-aws-v4",
"reqsign-core",
"reqsign-file-read-tokio",
@@ -9916,7 +9944,7 @@ version = "0.12.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2"
dependencies = [
"digest",
"digest 0.10.7",
"hmac",
]
@@ -9998,7 +10026,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "edd1101f170f5903fde0914f899bb503d9ff5271d7ba76bbb70bea63690cc0d5"
dependencies = [
"pest",
"sha2",
"sha2 0.10.9",
]
[[package]]
@@ -10276,7 +10304,7 @@ dependencies = [
"der",
"pbkdf2",
"scrypt",
"sha2",
"sha2 0.10.9",
"spki",
]
@@ -10399,10 +10427,10 @@ dependencies = [
"bytes",
"fallible-iterator",
"hmac",
"md-5",
"md-5 0.10.6",
"memchr",
"rand 0.9.1",
"sha2",
"sha2 0.10.9",
"stringprep",
]
@@ -10457,7 +10485,7 @@ dependencies = [
"prost-build 0.12.6",
"prost-derive 0.12.6",
"protobuf 2.28.0",
"sha2",
"sha2 0.10.9",
"smallvec",
"symbolic-demangle",
"tempfile",
@@ -11043,7 +11071,7 @@ dependencies = [
"prometheus 0.14.0",
"serde",
"serde_json",
"sha2",
"sha2 0.10.9",
"snafu 0.8.6",
"tokio",
"tokio-util",
@@ -11179,19 +11207,9 @@ dependencies = [
[[package]]
name = "quick-xml"
version = "0.38.4"
version = "0.39.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b66c2058c55a409d601666cffe35f04333cf1013010882cec174a7467cd4e21c"
dependencies = [
"memchr",
"serde",
]
[[package]]
name = "quick-xml"
version = "0.39.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "958f21e8e7ceb5a1aa7fa87fab28e7c75976e0bfe7e23ff069e0a260f894067d"
checksum = "cdcc8dd4e2f670d309a5f0e83fe36dfdc05af317008fea29144da1a2ac858e5e"
dependencies = [
"memchr",
"serde",
@@ -11620,7 +11638,7 @@ dependencies = [
"http 1.3.1",
"log",
"percent-encoding",
"quick-xml 0.39.2",
"quick-xml 0.39.4",
"reqsign-core",
"rust-ini 0.21.1",
"serde",
@@ -11669,7 +11687,7 @@ dependencies = [
"log",
"percent-encoding",
"sha1",
"sha2",
"sha2 0.10.9",
"windows-sys 0.61.2",
]
@@ -11700,7 +11718,7 @@ dependencies = [
"rsa",
"serde",
"serde_json",
"sha2",
"sha2 0.10.9",
"tokio",
]
@@ -11885,15 +11903,15 @@ version = "0.9.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b8573f03f5883dcaebdfcf4725caa1ecb9c15b2ef50c43a07b816e06799bb12d"
dependencies = [
"const-oid",
"digest",
"const-oid 0.9.6",
"digest 0.10.7",
"num-bigint-dig",
"num-integer",
"num-traits",
"pkcs1",
"pkcs8",
"rand_core 0.6.4",
"sha2",
"sha2 0.10.9",
"signature",
"spki",
"subtle",
@@ -11908,13 +11926,13 @@ checksum = "9f1bcb95b531681a622f3d6972eaab523e17e2aad6d6209f0276628eb1cb5038"
dependencies = [
"base64 0.22.1",
"core2",
"digest",
"digest 0.10.7",
"hmac",
"pbkdf2",
"rand 0.8.5",
"serde",
"serde_json",
"sha2",
"sha2 0.10.9",
"stringprep",
"thiserror 2.0.17",
]
@@ -12025,7 +12043,7 @@ version = "7.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9d38ff6bf570dc3bb7100fce9f7b60c33fa71d80e88da3f2580df4ff2bdded74"
dependencies = [
"sha2",
"sha2 0.10.9",
"walkdir",
]
@@ -12348,7 +12366,7 @@ checksum = "0516a385866c09368f0b5bcd1caff3366aace790fcd46e2bb032697bb172fd1f"
dependencies = [
"pbkdf2",
"salsa20",
"sha2",
"sha2 0.10.9",
]
[[package]]
@@ -12782,7 +12800,7 @@ checksum = "f5058ada175748e33390e40e872bd0fe59a19f265d0158daa551c5a88a76009c"
dependencies = [
"cfg-if",
"cpufeatures 0.2.17",
"digest",
"digest 0.10.7",
]
[[package]]
@@ -12793,7 +12811,7 @@ checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba"
dependencies = [
"cfg-if",
"cpufeatures 0.2.17",
"digest",
"digest 0.10.7",
]
[[package]]
@@ -12804,7 +12822,18 @@ checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283"
dependencies = [
"cfg-if",
"cpufeatures 0.2.17",
"digest",
"digest 0.10.7",
]
[[package]]
name = "sha2"
version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "446ba717509524cb3f22f17ecc096f10f4822d76ab5c0b9822c5f9c284e825f4"
dependencies = [
"cfg-if",
"cpufeatures 0.3.0",
"digest 0.11.3",
]
[[package]]
@@ -12813,7 +12842,7 @@ version = "0.10.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "75872d278a8f37ef87fa0ddbda7802605cb18344497949862c0d4dcb291eba60"
dependencies = [
"digest",
"digest 0.10.7",
"keccak",
]
@@ -12847,7 +12876,7 @@ version = "2.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de"
dependencies = [
"digest",
"digest 0.10.7",
"rand_core 0.6.4",
]
@@ -13165,7 +13194,7 @@ dependencies = [
"reqwest 0.12.28",
"serde",
"serde_json",
"sha2",
"sha2 0.10.9",
"sqlness",
"tar",
"tempfile",
@@ -13250,7 +13279,7 @@ dependencies = [
"rustls",
"serde",
"serde_json",
"sha2",
"sha2 0.10.9",
"smallvec",
"thiserror 2.0.17",
"tokio",
@@ -13288,7 +13317,7 @@ dependencies = [
"quote",
"serde",
"serde_json",
"sha2",
"sha2 0.10.9",
"sqlx-core",
"sqlx-mysql",
"sqlx-postgres",
@@ -13311,7 +13340,7 @@ dependencies = [
"bytes",
"chrono",
"crc",
"digest",
"digest 0.10.7",
"dotenvy",
"either",
"futures-channel",
@@ -13324,7 +13353,7 @@ dependencies = [
"hmac",
"itoa",
"log",
"md-5",
"md-5 0.10.6",
"memchr",
"once_cell",
"percent-encoding",
@@ -13333,7 +13362,7 @@ dependencies = [
"rust_decimal",
"serde",
"sha1",
"sha2",
"sha2 0.10.9",
"smallvec",
"sqlx-core",
"stringprep",
@@ -13365,14 +13394,14 @@ dependencies = [
"home",
"itoa",
"log",
"md-5",
"md-5 0.10.6",
"memchr",
"once_cell",
"rand 0.8.5",
"rust_decimal",
"serde",
"serde_json",
"sha2",
"sha2 0.10.9",
"smallvec",
"sqlx-core",
"stringprep",
@@ -15159,7 +15188,7 @@ version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fc1de2c688dc15305988b563c3854064043356019f97a4b46276fe734c4f07ea"
dependencies = [
"crypto-common",
"crypto-common 0.1.6",
"subtle",
]
@@ -15355,7 +15384,7 @@ dependencies = [
"crypto_secretbox",
"csv",
"ctr",
"digest",
"digest 0.10.7",
"dns-lookup",
"domain",
"dyn-clone",
@@ -15375,7 +15404,7 @@ dependencies = [
"lalrpop",
"lalrpop-util",
"lz4_flex 0.11.6",
"md-5",
"md-5 0.10.6",
"nom 7.1.3",
"ofb",
"onig",
@@ -15400,7 +15429,7 @@ dependencies = [
"serde_json",
"serde_yaml",
"sha-1",
"sha2",
"sha2 0.10.9",
"sha3",
"simdutf8",
"snafu 0.8.6",

View File

@@ -178,7 +178,7 @@ nalgebra = "0.33"
nix = { version = "0.30.1", default-features = false, features = ["event", "fs", "process"] }
notify = "8.0"
num_cpus = "1.16"
object_store_opendal = "0.56"
object_store_opendal = { git = "https://github.com/apache/opendal.git", rev = "4ad2d85296ffa6fdc2882f97d3c760ee243913f7" }
once_cell = "1.18"
opentelemetry-proto = { version = "0.31", features = [
"gen-tonic",

View File

@@ -24,7 +24,7 @@ derive_builder = { workspace = true, optional = true }
futures.workspace = true
humantime-serde.workspace = true
lazy_static.workspace = true
opendal = { version = "0.56", features = [
opendal = { git = "https://github.com/apache/opendal.git", rev = "4ad2d85296ffa6fdc2882f97d3c760ee243913f7", features = [
"layers-tracing",
"layers-prometheus",
"services-azblob",

View File

@@ -14,15 +14,14 @@
use std::fmt::Display;
use std::path;
use std::time::Duration;
use common_error::root_source;
use common_telemetry::{debug, error, info, warn};
use opendal::ErrorKind;
use opendal::layers::{
LoggingInterceptor, LoggingLayer, RetryInterceptor, RetryLayer, TracingLayer,
LoggingInterceptor, LoggingLayer, RetryEvent, RetryInterceptor, RetryLayer, TracingLayer,
};
use opendal::raw::{AccessorInfo, HttpClient, Operation};
use opendal::{Error, ErrorKind};
use snafu::ResultExt;
use crate::config::HttpClientConfig;
@@ -239,8 +238,12 @@ pub struct PrintDetailedError;
// PrintDetailedError is a retry interceptor that prints error in Debug format in retrying.
impl RetryInterceptor for PrintDetailedError {
fn intercept(&self, err: &Error, dur: Duration) {
warn!("Retry after {}s, error: {:#?}", dur.as_secs_f64(), err);
fn intercept(&self, event: RetryEvent<'_>) {
warn!(
"Retry after {}s, error: {:#?}",
event.retry_after.as_secs_f64(),
event.err
);
}
}