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 f46df2490c98fd3eb97387ec0ba7ad81475ff900 Author: Xuanwo <[email protected]> AuthorDate: Mon Sep 11 14:12:41 2023 +0800 Make clippy happy Signed-off-by: Xuanwo <[email protected]> --- core/src/raw/oio/write/range_write.rs | 18 ++---------------- core/src/services/gcs/core.rs | 1 - core/src/services/gcs/writer.rs | 4 ---- core/src/services/ghac/writer.rs | 4 ++-- 4 files changed, 4 insertions(+), 23 deletions(-) diff --git a/core/src/raw/oio/write/range_write.rs b/core/src/raw/oio/write/range_write.rs index a96af8d3d..56276327a 100644 --- a/core/src/raw/oio/write/range_write.rs +++ b/core/src/raw/oio/write/range_write.rs @@ -89,20 +89,6 @@ impl<W: RangeWrite> RangeWriter<W> { } } -impl<W: RangeWrite> RangeWriter<W> { - fn align(&mut self, bs: &dyn WriteBuf) -> usize { - let remaining = bs.remaining(); - let current_size = self.align_buffer.len(); - - let total_size = current_size + remaining; - if total_size <= self.align_size { - return remaining; - } - - total_size - total_size % self.align_size - current_size - } -} - impl<W: RangeWrite> oio::Write for RangeWriter<W> { fn poll_write(&mut self, cx: &mut Context<'_>, bs: &dyn WriteBuf) -> Poll<Result<usize>> { loop { @@ -191,7 +177,7 @@ impl<W: RangeWrite> oio::Write for RangeWriter<W> { self.align_buffer.len() > 0, "RangeWriter requires to have last chunk" ); - let mut align_buffer = self.align_buffer.clone(); + let align_buffer = self.align_buffer.clone(); let written = self.written; let fut = async move { @@ -243,7 +229,7 @@ impl<W: RangeWrite> oio::Write for RangeWriter<W> { (w, res) }; - self.state = State::Complete(Box::pin(fut)); + self.state = State::Abort(Box::pin(fut)); } None => return Poll::Ready(Ok(())), } diff --git a/core/src/services/gcs/core.rs b/core/src/services/gcs/core.rs index 82c6d9054..06d772e06 100644 --- a/core/src/services/gcs/core.rs +++ b/core/src/services/gcs/core.rs @@ -23,7 +23,6 @@ use std::time::Duration; use backon::ExponentialBuilder; use backon::Retryable; -use bytes::Bytes; use http::header::CONTENT_LENGTH; use http::header::CONTENT_RANGE; use http::header::CONTENT_TYPE; diff --git a/core/src/services/gcs/writer.rs b/core/src/services/gcs/writer.rs index 6b66240f7..1b22acd7b 100644 --- a/core/src/services/gcs/writer.rs +++ b/core/src/services/gcs/writer.rs @@ -15,14 +15,10 @@ // specific language governing permissions and limitations // under the License. -use std::fmt::{Debug, Formatter}; use std::sync::Arc; -use std::task::{ready, Context, Poll}; use async_trait::async_trait; use bytes::Bytes; -use futures::future::BoxFuture; -use futures::FutureExt; use http::StatusCode; use super::core::GcsCore; diff --git a/core/src/services/ghac/writer.rs b/core/src/services/ghac/writer.rs index 439bbbb2e..09eb82d8f 100644 --- a/core/src/services/ghac/writer.rs +++ b/core/src/services/ghac/writer.rs @@ -124,7 +124,7 @@ impl oio::Write for GhacWriter { if resp.status().is_success() { resp.into_body().consume().await?; - Ok(size as usize) + Ok(()) } else { Err(parse_error(resp) .await @@ -135,7 +135,7 @@ impl oio::Write for GhacWriter { (backend, res) }; - self.state = State::Upload(Box::pin(fut)); + self.state = State::Commit(Box::pin(fut)); } State::Upload(_) => { unreachable!("GhacWriter must not go into State:Upload during poll_close")
