This is an automated email from the ASF dual-hosted git repository. xuanwo pushed a commit to branch fix-cargo-lock in repository https://gitbox.apache.org/repos/asf/incubator-opendal.git
commit edb47fc45307948db93ffcac312a8d7c983b5f9b Author: Xuanwo <[email protected]> AuthorDate: Tue Apr 18 18:22:35 2023 +0800 fix: Cargo lock not updated Signed-off-by: Xuanwo <[email protected]> --- Cargo.lock | 169 +++++++++++++++++++++++++++++++++++- bindings/c/build.rs | 3 +- core/Cargo.toml | 6 +- core/src/layers/madsim.rs | 86 +++++++++++------- core/src/layers/minitrace.rs | 4 +- core/src/layers/mod.rs | 1 - core/src/layers/prometheus.rs | 7 +- core/src/services/obs/core.rs | 5 +- core/src/services/oss/core.rs | 3 +- core/src/services/s3/core.rs | 3 +- core/src/services/webhdfs/pager.rs | 3 +- core/src/types/operator/operator.rs | 4 +- 12 files changed, 241 insertions(+), 53 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f66fcde7..d87f7083 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -188,11 +188,33 @@ dependencies = [ "wasm-bindgen-futures", ] +[[package]] +name = "async-stream" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index"; +checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51" +dependencies = [ + "async-stream-impl", + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "async-stream-impl" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index"; +checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.12", +] + [[package]] name = "async-task" -version = "4.3.0" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index"; -checksum = "7a40729d2133846d9ed0ea60a8b9541bccddab49cd30f0715a1da672fe9a2524" +checksum = "ecc7ab41815b3c653ccd2978ec3255c81349336702dfdf62ee6f7069b12a3aae" [[package]] name = "async-tls" @@ -284,6 +306,15 @@ dependencies = [ "tokio", ] +[[package]] +name = "bincode" +version = "1.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index"; +checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" +dependencies = [ + "serde", +] + [[package]] name = "bindgen" version = "0.60.1" @@ -818,6 +849,41 @@ dependencies = [ "syn 2.0.12", ] +[[package]] +name = "darling" +version = "0.14.4" +source = "registry+https://github.com/rust-lang/crates.io-index"; +checksum = "7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850" +dependencies = [ + "darling_core", + "darling_macro", +] + +[[package]] +name = "darling_core" +version = "0.14.4" +source = "registry+https://github.com/rust-lang/crates.io-index"; +checksum = "109c1ca6e6b7f82cc233a97004ea8ed7ca123a9af07a8230878fcfda9b158bf0" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim", + "syn 1.0.109", +] + +[[package]] +name = "darling_macro" +version = "0.14.4" +source = "registry+https://github.com/rust-lang/crates.io-index"; +checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e" +dependencies = [ + "darling_core", + "quote", + "syn 1.0.109", +] + [[package]] name = "dashmap" version = "5.4.0" @@ -929,6 +995,12 @@ version = "0.15.6" source = "registry+https://github.com/rust-lang/crates.io-index"; checksum = "03d8c417d7a8cb362e0c37e5d815f5eb7c37f79ff93707329d5a194e42e54ca0" +[[package]] +name = "downcast-rs" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index"; +checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" + [[package]] name = "either" version = "1.8.1" @@ -1487,6 +1559,12 @@ dependencies = [ "cxx-build", ] +[[package]] +name = "ident_case" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index"; +checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" + [[package]] name = "idna" version = "0.2.3" @@ -1693,7 +1771,7 @@ version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index"; checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" dependencies = [ - "spin", + "spin 0.5.2", ] [[package]] @@ -1808,6 +1886,48 @@ dependencies = [ "libc", ] +[[package]] +name = "madsim" +version = "0.2.21" +source = "registry+https://github.com/rust-lang/crates.io-index"; +checksum = "3d3f6f28042419b0a63a7db6a8b4f74db021453d567f76cdbfd81494eeec0b22" +dependencies = [ + "ahash", + "async-channel", + "async-stream", + "async-task", + "bincode", + "bytes", + "downcast-rs", + "futures-util", + "lazy_static", + "libc", + "madsim-macros", + "naive-timer", + "rand 0.8.5", + "rand_xoshiro", + "rustversion", + "serde", + "spin 0.9.8", + "tokio", + "tokio-util", + "toml 0.7.3", + "tracing", + "tracing-subscriber", +] + +[[package]] +name = "madsim-macros" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index"; +checksum = "f3d248e97b1a48826a12c3828d921e8548e714394bf17274dd0a93910dc946e1" +dependencies = [ + "darling", + "proc-macro2", + "quote", + "syn 1.0.109", +] + [[package]] name = "magnus" version = "0.5.2" @@ -1995,6 +2115,12 @@ dependencies = [ "uuid", ] +[[package]] +name = "naive-timer" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index"; +checksum = "034a0ad7deebf0c2abcf2435950a6666c3c15ea9d8fad0c0f48efa8a7f843fed" + [[package]] name = "napi" version = "2.12.0" @@ -2253,6 +2379,7 @@ dependencies = [ "hyper", "lazy-regex", "log", + "madsim", "md-5", "metrics", "minitrace", @@ -3076,6 +3203,15 @@ dependencies = [ "rand_core 0.5.1", ] +[[package]] +name = "rand_xoshiro" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index"; +checksum = "6f97cdb2a36ed4183de61b2f824cc45c9f1037f28afe0a322e9fff4c108b5aaa" +dependencies = [ + "rand_core 0.6.4", +] + [[package]] name = "raw-cpuid" version = "10.7.0" @@ -3308,7 +3444,7 @@ dependencies = [ "cc", "libc", "once_cell", - "spin", + "spin 0.5.2", "untrusted", "web-sys", "winapi", @@ -3430,6 +3566,12 @@ dependencies = [ "base64 0.21.0", ] +[[package]] +name = "rustversion" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index"; +checksum = "4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06" + [[package]] name = "ryu" version = "1.0.13" @@ -3639,6 +3781,15 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index"; checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3" +[[package]] +name = "signal-hook-registry" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index"; +checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +dependencies = [ + "libc", +] + [[package]] name = "signature" version = "2.0.0" @@ -3751,6 +3902,15 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index"; checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" +[[package]] +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index"; +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" +dependencies = [ + "lock_api", +] + [[package]] name = "spki" version = "0.6.0" @@ -3984,6 +4144,7 @@ dependencies = [ "num_cpus", "parking_lot 0.12.1", "pin-project-lite", + "signal-hook-registry", "socket2", "tokio-macros", "windows-sys 0.45.0", diff --git a/bindings/c/build.rs b/bindings/c/build.rs index c82ba643..0e7be35b 100644 --- a/bindings/c/build.rs +++ b/bindings/c/build.rs @@ -18,7 +18,8 @@ extern crate cbindgen; use std::io::ErrorKind; -use std::{path::Path, process::Command}; +use std::path::Path; +use std::process::Command; fn main() { let header_file = Path::new("include").join("opendal.h"); diff --git a/core/Cargo.toml b/core/Cargo.toml index cb1590d5..ead02145 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -74,7 +74,7 @@ layers-all = [ "layers-prometheus", "layers-tracing", "layers-minitrace", - "layers-madsim" + "layers-madsim", ] # Enable layers chaos support layers-chaos = ["dep:rand"] @@ -166,7 +166,7 @@ http = "0.2.5" hyper = "0.14" lazy-regex = { version = "2.5.0", optional = true } log = "0.4" -madsim = {version = "0.2.21", optional = true } +madsim = { version = "0.2.21", optional = true } md-5 = "0.10" metrics = { version = "0.20", optional = true } minitrace = { version = "0.4.0", optional = true } @@ -175,7 +175,7 @@ once_cell = "1" parking_lot = "0.12" percent-encoding = "2" pin-project = "1" -prometheus = { version = "0.13", features = ["process"], optional = true} +prometheus = { version = "0.13", features = ["process"], optional = true } prost = { version = "0.11", optional = true } quick-xml = { version = "0.27", features = ["serialize", "overlapped-lists"] } rand = { version = "0.8", optional = true } diff --git a/core/src/layers/madsim.rs b/core/src/layers/madsim.rs index b76ebc94..8d74d9c4 100644 --- a/core/src/layers/madsim.rs +++ b/core/src/layers/madsim.rs @@ -15,17 +15,6 @@ // specific language governing permissions and limitations // under the License. -use crate::ops::{OpList, OpRead, OpScan, OpWrite}; -use crate::raw::oio::Entry; -use crate::raw::AccessorCapability; -use crate::raw::AccessorInfo; -use crate::raw::{oio, Accessor, Layer, LayeredAccessor, RpList, RpRead, RpScan, RpWrite}; -use crate::types::Error; -use crate::types::ErrorKind; -use async_trait::async_trait; -use bytes::Bytes; -use madsim::net::Endpoint; -use madsim::net::Payload; use std::collections::HashMap; use std::fmt::Debug; use std::io::Result; @@ -33,7 +22,31 @@ use std::io::SeekFrom; use std::net::SocketAddr; use std::sync::Arc; use std::sync::Mutex; -use std::task::{Context, Poll}; +use std::task::Context; +use std::task::Poll; + +use async_trait::async_trait; +use bytes::Bytes; +use madsim::net::Endpoint; +use madsim::net::Payload; + +use crate::ops::OpList; +use crate::ops::OpRead; +use crate::ops::OpScan; +use crate::ops::OpWrite; +use crate::raw::oio; +use crate::raw::oio::Entry; +use crate::raw::Accessor; +use crate::raw::AccessorCapability; +use crate::raw::AccessorInfo; +use crate::raw::Layer; +use crate::raw::LayeredAccessor; +use crate::raw::RpList; +use crate::raw::RpRead; +use crate::raw::RpScan; +use crate::raw::RpWrite; +use crate::types::Error; +use crate::types::ErrorKind; /// Add deterministic simulation for async operations, powered by [`madsim`](https://docs.rs/madsim/latest/madsim/). /// @@ -45,16 +58,19 @@ use std::task::{Context, Poll}; /// # Examples /// /// ``` -/// use opendal::Operator; -/// use opendal::services; +/// use std::time::Duration; +/// +/// use madsim::net::NetSim; +/// use madsim::runtime::Handle; +/// use madsim::time::sleep; /// use opendal::layers::MadsimLayer; /// use opendal::layers::MadsimServer; -/// use madsim::{net::NetSim, runtime::Handle, time::sleep}; -/// use std::time::Duration; +/// use opendal::services; +/// use opendal::Operator; /// /// #[cfg(madsim)] /// #[madsim::test] -/// async fn deterministic_simulation_test(){ +/// async fn deterministic_simulation_test() { /// let handle = Handle::current(); /// let ip1 = "10.0.0.1".parse().unwrap(); /// let ip2 = "10.0.0.2".parse().unwrap(); @@ -63,24 +79,24 @@ use std::task::{Context, Poll}; /// let client = handle.create_node().name("client").ip(ip2).build(); /// /// server.spawn(async move { -/// SimServer::serve(server_addr).await.unwrap(); +/// SimServer::serve(server_addr).await.unwrap(); /// }); /// sleep(Duration::from_secs(1)).await; /// /// let handle = client.spawn(async move { -/// let mut builder = services::Fs::default(); -/// builder.root("."); -/// let op = Operator::new(builder) -/// .unwrap() -/// .layer(MadsimLayer::new(server_addr)) -/// .finish(); +/// let mut builder = services::Fs::default(); +/// builder.root("."); +/// let op = Operator::new(builder) +/// .unwrap() +/// .layer(MadsimLayer::new(server_addr)) +/// .finish(); /// -/// let path = "hello.txt"; -/// let data = "Hello, World!"; -/// op.write(path, data).await.unwrap(); -/// assert_eq!(data.as_bytes(), op.read(path).await.unwrap()); -/// }); -/// handle.await.unwrap(); +/// let path = "hello.txt"; +/// let data = "Hello, World!"; +/// op.write(path, data).await.unwrap(); +/// assert_eq!(data.as_bytes(), op.read(path).await.unwrap()); +/// }); +/// handle.await.unwrap(); /// } /// ``` /// To enable logging output, please set `RUSTFLAGS="--cfg madsim"`: @@ -380,11 +396,15 @@ struct WriteResponse {} #[cfg(test)] mod test { - use super::*; - use crate::{services, Operator}; - use madsim::{runtime::Handle, time::sleep}; use std::time::Duration; + use madsim::runtime::Handle; + use madsim::time::sleep; + + use super::*; + use crate::services; + use crate::Operator; + #[madsim::test] async fn test_madsim_layer() { let handle = Handle::current(); diff --git a/core/src/layers/minitrace.rs b/core/src/layers/minitrace.rs index 3759fb19..3e91bac6 100644 --- a/core/src/layers/minitrace.rs +++ b/core/src/layers/minitrace.rs @@ -26,7 +26,9 @@ use futures::FutureExt; use minitrace::prelude::*; use crate::ops::*; -use crate::raw::oio::{PageOperation, ReadOperation, WriteOperation}; +use crate::raw::oio::PageOperation; +use crate::raw::oio::ReadOperation; +use crate::raw::oio::WriteOperation; use crate::raw::*; use crate::*; diff --git a/core/src/layers/mod.rs b/core/src/layers/mod.rs index 3b6b7756..e18045f0 100644 --- a/core/src/layers/mod.rs +++ b/core/src/layers/mod.rs @@ -70,7 +70,6 @@ mod madsim; #[cfg(feature = "layers-madsim")] #[cfg(madsim)] pub use self::madsim::MadsimLayer; - #[cfg(feature = "layers-madsim")] #[cfg(madsim)] pub use self::madsim::MadsimServer; diff --git a/core/src/layers/prometheus.rs b/core/src/layers/prometheus.rs index a83c716a..4689c383 100644 --- a/core/src/layers/prometheus.rs +++ b/core/src/layers/prometheus.rs @@ -27,14 +27,14 @@ use bytes::Bytes; use futures::FutureExt; use futures::TryFutureExt; use log::debug; - +use prometheus::core::AtomicU64; use prometheus::core::GenericCounterVec; use prometheus::exponential_buckets; use prometheus::histogram_opts; use prometheus::register_histogram_vec_with_registry; use prometheus::register_int_counter_vec_with_registry; +use prometheus::HistogramVec; use prometheus::Registry; -use prometheus::{core::AtomicU64, HistogramVec}; use crate::ops::*; use crate::raw::Accessor; @@ -47,11 +47,10 @@ use crate::*; /// ``` /// use log::debug; /// use log::info; +/// use opendal::layers::PrometheusLayer; /// use opendal::services; /// use opendal::Operator; /// use opendal::Result; -/// -/// use opendal::layers::PrometheusLayer; /// use prometheus::Encoder; /// /// /// Visit [`opendal::services`] for more service related config. diff --git a/core/src/services/obs/core.rs b/core/src/services/obs/core.rs index a71a048d..c61f1f02 100644 --- a/core/src/services/obs/core.rs +++ b/core/src/services/obs/core.rs @@ -18,8 +18,6 @@ use std::fmt::Debug; use std::fmt::Formatter; -use crate::raw::*; -use crate::*; use http::header::CONTENT_LENGTH; use http::header::CONTENT_TYPE; use http::header::IF_MATCH; @@ -29,6 +27,9 @@ use reqsign::HuaweicloudObsCredential; use reqsign::HuaweicloudObsCredentialLoader; use reqsign::HuaweicloudObsSigner; +use crate::raw::*; +use crate::*; + pub struct ObsCore { pub bucket: String, pub root: String, diff --git a/core/src/services/oss/core.rs b/core/src/services/oss/core.rs index 387d8b83..6922869c 100644 --- a/core/src/services/oss/core.rs +++ b/core/src/services/oss/core.rs @@ -20,11 +20,12 @@ use std::fmt::Formatter; use std::time::Duration; use bytes::Bytes; +use http::header::CACHE_CONTROL; use http::header::CONTENT_DISPOSITION; use http::header::CONTENT_LENGTH; use http::header::CONTENT_TYPE; +use http::header::IF_NONE_MATCH; use http::header::RANGE; -use http::header::{CACHE_CONTROL, IF_NONE_MATCH}; use http::Request; use http::Response; use reqsign::AliyunCredential; diff --git a/core/src/services/s3/core.rs b/core/src/services/s3/core.rs index e236f2e5..6844212a 100644 --- a/core/src/services/s3/core.rs +++ b/core/src/services/s3/core.rs @@ -24,11 +24,12 @@ use std::time::Duration; use backon::ExponentialBuilder; use backon::Retryable; use bytes::Bytes; +use http::header::HeaderName; use http::header::CACHE_CONTROL; use http::header::CONTENT_DISPOSITION; use http::header::CONTENT_LENGTH; use http::header::CONTENT_TYPE; -use http::header::{HeaderName, IF_NONE_MATCH}; +use http::header::IF_NONE_MATCH; use http::HeaderValue; use http::Request; use http::Response; diff --git a/core/src/services/webhdfs/pager.rs b/core/src/services/webhdfs/pager.rs index e58330cd..dc90473e 100644 --- a/core/src/services/webhdfs/pager.rs +++ b/core/src/services/webhdfs/pager.rs @@ -17,7 +17,8 @@ use async_trait::async_trait; -use super::message::{FileStatus, FileStatusType}; +use super::message::FileStatus; +use super::message::FileStatusType; use crate::raw::*; use crate::*; diff --git a/core/src/types/operator/operator.rs b/core/src/types/operator/operator.rs index 32a60a22..8156dcc8 100644 --- a/core/src/types/operator/operator.rs +++ b/core/src/types/operator/operator.rs @@ -482,7 +482,9 @@ impl Operator { /// # use futures::TryStreamExt; /// # #[tokio::main] /// # async fn test(op: Operator) -> Result<()> { - /// let bs = op.range_read_with("path/to/file", 1024..2048, OpRead::new()).await?; + /// let bs = op + /// .range_read_with("path/to/file", 1024..2048, OpRead::new()) + /// .await?; /// # Ok(()) /// # } /// ```
