This is an automated email from the ASF dual-hosted git repository. xuanwo pushed a commit to branch poll-write in repository https://gitbox.apache.org/repos/asf/incubator-opendal.git
commit 77f36bba2e3a417abc33daa473629e311c3fce05 Author: Xuanwo <[email protected]> AuthorDate: Fri Sep 8 17:59:47 2023 +0800 Fix test Signed-off-by: Xuanwo <[email protected]> --- core/benches/oio/utils.rs | 6 +++--- core/benches/oio/write.rs | 1 - core/src/layers/oteltrace.rs | 1 - core/src/layers/throttle.rs | 2 +- core/src/layers/timeout.rs | 2 ++ core/src/raw/adapters/typed_kv/backend.rs | 2 +- core/src/raw/oio/write/api.rs | 2 +- core/src/raw/oio/write/append_object_write.rs | 4 ++-- core/src/raw/oio/write/exact_buf_write.rs | 8 ++++---- core/src/raw/oio/write/multipart_upload_write.rs | 2 +- core/src/services/azblob/writer.rs | 2 +- core/src/services/azdfs/writer.rs | 1 - core/src/services/ftp/writer.rs | 4 ++-- core/src/services/gcs/writer.rs | 6 +++--- core/src/services/gdrive/writer.rs | 1 - core/src/services/ghac/writer.rs | 2 +- core/src/services/hdfs/writer.rs | 2 +- core/src/services/ipmfs/writer.rs | 3 --- core/src/services/onedrive/writer.rs | 1 - core/src/services/sftp/writer.rs | 8 +++----- core/src/services/supabase/writer.rs | 1 - core/src/services/wasabi/writer.rs | 1 - core/src/types/writer.rs | 4 ---- 23 files changed, 26 insertions(+), 40 deletions(-) diff --git a/core/benches/oio/utils.rs b/core/benches/oio/utils.rs index b3ea04027..fe418922e 100644 --- a/core/benches/oio/utils.rs +++ b/core/benches/oio/utils.rs @@ -29,17 +29,17 @@ pub struct BlackHoleWriter; impl oio::Write for BlackHoleWriter { fn poll_write( &mut self, - cx: &mut Context<'_>, + _: &mut Context<'_>, bs: &dyn oio::WriteBuf, ) -> Poll<opendal::Result<usize>> { Poll::Ready(Ok(bs.remaining())) } - fn poll_abort(&mut self, cx: &mut Context<'_>) -> Poll<opendal::Result<()>> { + fn poll_abort(&mut self, _: &mut Context<'_>) -> Poll<opendal::Result<()>> { Poll::Ready(Ok(())) } - fn poll_close(&mut self, cx: &mut Context<'_>) -> Poll<opendal::Result<()>> { + fn poll_close(&mut self, _: &mut Context<'_>) -> Poll<opendal::Result<()>> { Poll::Ready(Ok(())) } } diff --git a/core/benches/oio/write.rs b/core/benches/oio/write.rs index 3ab71cdcf..2ce7d3a2e 100644 --- a/core/benches/oio/write.rs +++ b/core/benches/oio/write.rs @@ -18,7 +18,6 @@ use bytes::Buf; use criterion::Criterion; use once_cell::sync::Lazy; -use opendal::raw::oio::Write; use opendal::raw::oio::{ExactBufWriter, WriteExt}; use rand::thread_rng; use size::Size; diff --git a/core/src/layers/oteltrace.rs b/core/src/layers/oteltrace.rs index 145b997d5..b0d80fe1d 100644 --- a/core/src/layers/oteltrace.rs +++ b/core/src/layers/oteltrace.rs @@ -16,7 +16,6 @@ // under the License. use std::io; -use std::task; use std::task::{Context, Poll}; use async_trait::async_trait; diff --git a/core/src/layers/throttle.rs b/core/src/layers/throttle.rs index 72e63abe0..708d5980b 100644 --- a/core/src/layers/throttle.rs +++ b/core/src/layers/throttle.rs @@ -225,7 +225,7 @@ impl<R: oio::Write> oio::Write for ThrottleWrapper<R> { Err(negative) => match negative { // the query is valid but the Decider can not accommodate them. NegativeMultiDecision::BatchNonConforming(_, not_until) => { - let wait_time = not_until.wait_time_from(DefaultClock::default().now()); + let _ = not_until.wait_time_from(DefaultClock::default().now()); // TODO: Should lock the limiter and wait for the wait_time, or should let other small requests go first? // FIXME: we should sleep here. diff --git a/core/src/layers/timeout.rs b/core/src/layers/timeout.rs index d6cd4d24a..2cabf36af 100644 --- a/core/src/layers/timeout.rs +++ b/core/src/layers/timeout.rs @@ -206,6 +206,7 @@ pub struct TimeoutWrapper<R> { inner: R, timeout: Duration, + #[allow(dead_code)] speed: u64, start: Option<Instant>, @@ -221,6 +222,7 @@ impl<R> TimeoutWrapper<R> { } } + #[allow(dead_code)] fn io_timeout(&self, size: u64) -> Duration { let timeout = Duration::from_millis(size * 1000 / self.speed + 1); diff --git a/core/src/raw/adapters/typed_kv/backend.rs b/core/src/raw/adapters/typed_kv/backend.rs index ce0f9f073..8ddc0f524 100644 --- a/core/src/raw/adapters/typed_kv/backend.rs +++ b/core/src/raw/adapters/typed_kv/backend.rs @@ -411,7 +411,7 @@ impl<S> KvWriter<S> { #[async_trait] impl<S: Adapter> oio::Write for KvWriter<S> { // TODO: we need to support append in the future. - fn poll_write(&mut self, cx: &mut Context<'_>, bs: &dyn oio::WriteBuf) -> Poll<Result<usize>> { + fn poll_write(&mut self, _: &mut Context<'_>, bs: &dyn oio::WriteBuf) -> Poll<Result<usize>> { if self.future.is_some() { self.future = None; return Poll::Ready(Err(Error::new( diff --git a/core/src/raw/oio/write/api.rs b/core/src/raw/oio/write/api.rs index c05f061c7..c38221675 100644 --- a/core/src/raw/oio/write/api.rs +++ b/core/src/raw/oio/write/api.rs @@ -166,7 +166,7 @@ where type Output = Result<usize>; fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Result<usize>> { - let mut this = self.project(); + let this = self.project(); Pin::new(this.writer).poll_write(cx, *this.buf) } } diff --git a/core/src/raw/oio/write/append_object_write.rs b/core/src/raw/oio/write/append_object_write.rs index 5cbaedb37..c2d0d498b 100644 --- a/core/src/raw/oio/write/append_object_write.rs +++ b/core/src/raw/oio/write/append_object_write.rs @@ -119,11 +119,11 @@ where } } - fn poll_close(&mut self, cx: &mut Context<'_>) -> Poll<Result<()>> { + fn poll_close(&mut self, _: &mut Context<'_>) -> Poll<Result<()>> { Poll::Ready(Ok(())) } - fn poll_abort(&mut self, cx: &mut Context<'_>) -> Poll<Result<()>> { + fn poll_abort(&mut self, _: &mut Context<'_>) -> Poll<Result<()>> { Poll::Ready(Ok(())) } } diff --git a/core/src/raw/oio/write/exact_buf_write.rs b/core/src/raw/oio/write/exact_buf_write.rs index 636242280..5c700029b 100644 --- a/core/src/raw/oio/write/exact_buf_write.rs +++ b/core/src/raw/oio/write/exact_buf_write.rs @@ -22,7 +22,6 @@ use async_trait::async_trait; use bytes::{Bytes, BytesMut}; use crate::raw::oio::WriteBuf; -use crate::raw::oio::WriteExt; use crate::raw::*; use crate::*; @@ -146,6 +145,7 @@ mod tests { use super::*; use crate::raw::oio::Write; + use crate::raw::oio::WriteExt; struct MockWriter { buf: Vec<u8>, @@ -153,7 +153,7 @@ mod tests { #[async_trait] impl Write for MockWriter { - fn poll_write(&mut self, cx: &mut Context<'_>, bs: &dyn WriteBuf) -> Poll<Result<usize>> { + fn poll_write(&mut self, _: &mut Context<'_>, bs: &dyn WriteBuf) -> Poll<Result<usize>> { debug!( "test_fuzz_exact_buf_writer: flush size: {}", bs.chunk().len() @@ -163,11 +163,11 @@ mod tests { Poll::Ready(Ok(bs.chunk().len())) } - fn poll_abort(&mut self, cx: &mut Context<'_>) -> Poll<Result<()>> { + fn poll_abort(&mut self, _: &mut Context<'_>) -> Poll<Result<()>> { Poll::Ready(Ok(())) } - fn poll_close(&mut self, cx: &mut Context<'_>) -> Poll<Result<()>> { + fn poll_close(&mut self, _: &mut Context<'_>) -> Poll<Result<()>> { Poll::Ready(Ok(())) } } diff --git a/core/src/raw/oio/write/multipart_upload_write.rs b/core/src/raw/oio/write/multipart_upload_write.rs index af6f825ac..81ee1f1ee 100644 --- a/core/src/raw/oio/write/multipart_upload_write.rs +++ b/core/src/raw/oio/write/multipart_upload_write.rs @@ -219,7 +219,7 @@ where let w = w.take().expect("writer must be valid"); match self.upload_id.clone() { Some(upload_id) => { - self.state = State::Close(Box::pin(async move { + self.state = State::Abort(Box::pin(async move { let res = w.abort_part(&upload_id).await; (w, res) })); diff --git a/core/src/services/azblob/writer.rs b/core/src/services/azblob/writer.rs index 70b023249..15a63caca 100644 --- a/core/src/services/azblob/writer.rs +++ b/core/src/services/azblob/writer.rs @@ -161,7 +161,7 @@ impl AzblobWriter { #[async_trait] impl oio::Write for AzblobWriter { - fn poll_write(&mut self, cx: &mut Context<'_>, bs: &dyn oio::WriteBuf) -> Poll<Result<usize>> { + fn poll_write(&mut self, _: &mut Context<'_>, _: &dyn oio::WriteBuf) -> Poll<Result<usize>> { todo!() } diff --git a/core/src/services/azdfs/writer.rs b/core/src/services/azdfs/writer.rs index 1da698dd4..9e2a962f2 100644 --- a/core/src/services/azdfs/writer.rs +++ b/core/src/services/azdfs/writer.rs @@ -16,7 +16,6 @@ // under the License. use std::sync::Arc; -use std::task::{Context, Poll}; use async_trait::async_trait; use bytes::Bytes; diff --git a/core/src/services/ftp/writer.rs b/core/src/services/ftp/writer.rs index 5a759aa21..f7e8497d6 100644 --- a/core/src/services/ftp/writer.rs +++ b/core/src/services/ftp/writer.rs @@ -81,11 +81,11 @@ impl oio::Write for FtpWriter { } } - fn poll_abort(&mut self, cx: &mut Context<'_>) -> Poll<Result<()>> { + fn poll_abort(&mut self, _: &mut Context<'_>) -> Poll<Result<()>> { Poll::Ready(Ok(())) } - fn poll_close(&mut self, cx: &mut Context<'_>) -> Poll<Result<()>> { + fn poll_close(&mut self, _: &mut Context<'_>) -> Poll<Result<()>> { Poll::Ready(Ok(())) } } diff --git a/core/src/services/gcs/writer.rs b/core/src/services/gcs/writer.rs index c21f6b4e5..c61c7df4c 100644 --- a/core/src/services/gcs/writer.rs +++ b/core/src/services/gcs/writer.rs @@ -119,7 +119,7 @@ impl GcsWriter { #[async_trait] impl oio::Write for GcsWriter { - fn poll_write(&mut self, cx: &mut Context<'_>, bs: &dyn oio::WriteBuf) -> Poll<Result<usize>> { + fn poll_write(&mut self, _: &mut Context<'_>, _: &dyn oio::WriteBuf) -> Poll<Result<usize>> { // let size = bs.remaining(); // // let location = match &self.location { @@ -164,7 +164,7 @@ impl oio::Write for GcsWriter { todo!() } - fn poll_abort(&mut self, cx: &mut Context<'_>) -> Poll<Result<()>> { + fn poll_abort(&mut self, _: &mut Context<'_>) -> Poll<Result<()>> { // let location = if let Some(location) = &self.location { // location // } else { @@ -188,7 +188,7 @@ impl oio::Write for GcsWriter { todo!() } - fn poll_close(&mut self, cx: &mut Context<'_>) -> Poll<Result<()>> { + fn poll_close(&mut self, _: &mut Context<'_>) -> Poll<Result<()>> { // let location = if let Some(location) = &self.location { // location // } else { diff --git a/core/src/services/gdrive/writer.rs b/core/src/services/gdrive/writer.rs index 2b0ac8c55..e70f1754e 100644 --- a/core/src/services/gdrive/writer.rs +++ b/core/src/services/gdrive/writer.rs @@ -24,7 +24,6 @@ use http::StatusCode; use super::core::GdriveCore; use super::error::parse_error; use crate::raw::*; -use crate::services::gdrive::core::GdriveFile; use crate::*; pub struct GdriveWriter { diff --git a/core/src/services/ghac/writer.rs b/core/src/services/ghac/writer.rs index 582a150aa..439bbbb2e 100644 --- a/core/src/services/ghac/writer.rs +++ b/core/src/services/ghac/writer.rs @@ -102,7 +102,7 @@ impl oio::Write for GhacWriter { } } - fn poll_abort(&mut self, cx: &mut Context<'_>) -> Poll<Result<()>> { + fn poll_abort(&mut self, _: &mut Context<'_>) -> Poll<Result<()>> { self.state = State::Idle(None); Poll::Ready(Ok(())) diff --git a/core/src/services/hdfs/writer.rs b/core/src/services/hdfs/writer.rs index ced19efb9..f2725813c 100644 --- a/core/src/services/hdfs/writer.rs +++ b/core/src/services/hdfs/writer.rs @@ -20,7 +20,7 @@ use std::pin::Pin; use std::task::{Context, Poll}; use async_trait::async_trait; -use futures::{AsyncWrite, AsyncWriteExt}; +use futures::AsyncWrite; use super::error::parse_io_error; use crate::raw::*; diff --git a/core/src/services/ipmfs/writer.rs b/core/src/services/ipmfs/writer.rs index feb5e5630..e6a32ac1b 100644 --- a/core/src/services/ipmfs/writer.rs +++ b/core/src/services/ipmfs/writer.rs @@ -18,11 +18,9 @@ use async_trait::async_trait; use bytes::Bytes; use http::StatusCode; -use std::task::{Context, Poll}; use super::backend::IpmfsBackend; use super::error::parse_error; -use crate::raw::oio::WriteBuf; use crate::raw::*; use crate::*; @@ -41,7 +39,6 @@ impl IpmfsWriter { #[async_trait] impl oio::OneShotWrite for IpmfsWriter { async fn write_once(&self, bs: Bytes) -> Result<()> { - let size = bs.len(); let resp = self.backend.ipmfs_write(&self.path, bs).await?; let status = resp.status(); diff --git a/core/src/services/onedrive/writer.rs b/core/src/services/onedrive/writer.rs index 727d8f7d3..5ad92ac63 100644 --- a/core/src/services/onedrive/writer.rs +++ b/core/src/services/onedrive/writer.rs @@ -23,7 +23,6 @@ use super::backend::OnedriveBackend; use super::error::parse_error; use super::graph_model::OneDriveUploadSessionCreationRequestBody; use super::graph_model::OneDriveUploadSessionCreationResponseBody; -use crate::raw::oio::OneShotWriter; use crate::raw::*; use crate::*; diff --git a/core/src/services/sftp/writer.rs b/core/src/services/sftp/writer.rs index 455e0fdbc..2f07710d0 100644 --- a/core/src/services/sftp/writer.rs +++ b/core/src/services/sftp/writer.rs @@ -16,9 +16,7 @@ // under the License. use async_trait::async_trait; -use futures::AsyncWrite; use openssh_sftp_client::file::File; -use std::pin::Pin; use std::task::{Context, Poll}; use crate::raw::oio; @@ -36,7 +34,7 @@ impl SftpWriter { #[async_trait] impl oio::Write for SftpWriter { - fn poll_write(&mut self, cx: &mut Context<'_>, bs: &dyn oio::WriteBuf) -> Poll<Result<usize>> { + fn poll_write(&mut self, _: &mut Context<'_>, _: &dyn oio::WriteBuf) -> Poll<Result<usize>> { // Pin::new(&mut self.file) // .poll_write(cx, bs.chunk()) // .map_err(Error::from) @@ -44,11 +42,11 @@ impl oio::Write for SftpWriter { todo!() } - fn poll_abort(&mut self, cx: &mut Context<'_>) -> Poll<Result<()>> { + fn poll_abort(&mut self, _: &mut Context<'_>) -> Poll<Result<()>> { Poll::Ready(Ok(())) } - fn poll_close(&mut self, cx: &mut Context<'_>) -> Poll<Result<()>> { + fn poll_close(&mut self, _: &mut Context<'_>) -> Poll<Result<()>> { // Pin::new(&mut self.file).poll_flush(cx).map_err(Error::from) todo!() } diff --git a/core/src/services/supabase/writer.rs b/core/src/services/supabase/writer.rs index 52292a737..c7fc6c8f8 100644 --- a/core/src/services/supabase/writer.rs +++ b/core/src/services/supabase/writer.rs @@ -16,7 +16,6 @@ // under the License. use std::sync::Arc; -use std::task::{Context, Poll}; use async_trait::async_trait; use bytes::Bytes; diff --git a/core/src/services/wasabi/writer.rs b/core/src/services/wasabi/writer.rs index 254810aa9..f9e27334e 100644 --- a/core/src/services/wasabi/writer.rs +++ b/core/src/services/wasabi/writer.rs @@ -16,7 +16,6 @@ // under the License. use std::sync::Arc; -use std::task::Context; use async_trait::async_trait; use bytes::Bytes; diff --git a/core/src/types/writer.rs b/core/src/types/writer.rs index c90ebcc54..af67b6b0c 100644 --- a/core/src/types/writer.rs +++ b/core/src/types/writer.rs @@ -15,17 +15,13 @@ // specific language governing permissions and limitations // under the License. -use std::fmt::Display; use std::io; use std::pin::Pin; -use std::task::ready; use std::task::Context; use std::task::Poll; use bytes::Bytes; -use futures::future::BoxFuture; use futures::AsyncWrite; -use futures::FutureExt; use futures::TryStreamExt; use crate::raw::oio::WriteBuf;
