You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@opendal.apache.org by xu...@apache.org on 2024/03/28 12:13:46 UTC
(opendal) 02/02: cleanup code
This is an automated email from the ASF dual-hosted git repository.
xuanwo pushed a commit to branch refactor-oio-write
in repository https://gitbox.apache.org/repos/asf/opendal.git
commit 6779bd72e17e76c57d867db46050599b5fd9af49
Author: Xuanwo <gi...@xuanwo.io>
AuthorDate: Thu Mar 28 20:11:15 2024 +0800
cleanup code
Signed-off-by: Xuanwo <gi...@xuanwo.io>
---
core/src/layers/blocking.rs | 4 ++--
core/src/layers/complete.rs | 3 +--
core/src/layers/concurrent_limit.rs | 2 +-
core/src/layers/dtrace.rs | 1 -
core/src/layers/error_context.rs | 2 +-
core/src/layers/logging.rs | 2 +-
core/src/layers/metrics.rs | 1 -
core/src/layers/minitrace.rs | 1 -
core/src/layers/oteltrace.rs | 1 -
core/src/layers/prometheus.rs | 1 -
core/src/layers/prometheus_client.rs | 1 -
core/src/layers/retry.rs | 2 +-
core/src/layers/throttle.rs | 1 -
core/src/layers/timeout.rs | 2 +-
core/src/layers/tracing.rs | 1 -
core/src/raw/enum_utils.rs | 2 +-
core/src/raw/oio/write/api.rs | 2 +-
core/src/raw/oio/write/append_write.rs | 2 +-
core/src/raw/oio/write/exact_buf_write.rs | 4 ++--
core/src/services/alluxio/writer.rs | 2 --
core/src/services/fs/writer.rs | 2 +-
core/src/services/ghac/writer.rs | 2 --
core/src/services/hdfs/writer.rs | 1 -
core/src/services/hdfs_native/writer.rs | 1 -
core/src/services/sftp/writer.rs | 1 -
core/src/types/writer.rs | 2 +-
26 files changed, 15 insertions(+), 31 deletions(-)
diff --git a/core/src/layers/blocking.rs b/core/src/layers/blocking.rs
index 64d91be143..5d526f3933 100644
--- a/core/src/layers/blocking.rs
+++ b/core/src/layers/blocking.rs
@@ -16,8 +16,8 @@
// under the License.
use async_trait::async_trait;
-use bytes;
-use bytes::Bytes;
+
+
use tokio::runtime::Handle;
use crate::raw::*;
diff --git a/core/src/layers/complete.rs b/core/src/layers/complete.rs
index 674e20a538..c7c232382b 100644
--- a/core/src/layers/complete.rs
+++ b/core/src/layers/complete.rs
@@ -21,7 +21,6 @@ use std::fmt::Formatter;
use std::sync::Arc;
use async_trait::async_trait;
-use bytes::Bytes;
use crate::raw::oio::FlatLister;
use crate::raw::oio::PrefixLister;
@@ -735,7 +734,7 @@ mod tests {
}
async fn read(&self, _: &str, _: OpRead) -> Result<(RpRead, Self::Reader)> {
- Ok((RpRead::new(), Box::new(Bytes::new())))
+ Ok((RpRead::new(), Box::new(bytes::Bytes::new())))
}
async fn write(&self, _: &str, _: OpWrite) -> Result<(RpWrite, Self::Writer)> {
diff --git a/core/src/layers/concurrent_limit.rs b/core/src/layers/concurrent_limit.rs
index bd31680e15..e655c5c9d1 100644
--- a/core/src/layers/concurrent_limit.rs
+++ b/core/src/layers/concurrent_limit.rs
@@ -19,7 +19,7 @@ use std::fmt::Debug;
use std::sync::Arc;
use async_trait::async_trait;
-use bytes::Bytes;
+
use tokio::sync::OwnedSemaphorePermit;
use tokio::sync::Semaphore;
diff --git a/core/src/layers/dtrace.rs b/core/src/layers/dtrace.rs
index 74f926bd38..ca64b4e143 100644
--- a/core/src/layers/dtrace.rs
+++ b/core/src/layers/dtrace.rs
@@ -21,7 +21,6 @@ use std::fmt::Formatter;
use async_trait::async_trait;
use bytes::Buf;
-use bytes::Bytes;
use probe::probe_lazy;
use crate::raw::Accessor;
diff --git a/core/src/layers/error_context.rs b/core/src/layers/error_context.rs
index 3071616637..5b0f238bcf 100644
--- a/core/src/layers/error_context.rs
+++ b/core/src/layers/error_context.rs
@@ -19,7 +19,7 @@ use std::fmt::Debug;
use std::fmt::Formatter;
use async_trait::async_trait;
-use bytes::Bytes;
+
use futures::TryFutureExt;
use crate::raw::oio::ListOperation;
diff --git a/core/src/layers/logging.rs b/core/src/layers/logging.rs
index 112d282dce..96d8981571 100644
--- a/core/src/layers/logging.rs
+++ b/core/src/layers/logging.rs
@@ -21,7 +21,7 @@ use std::sync::atomic::Ordering;
use async_trait::async_trait;
use bytes::Buf;
-use bytes::Bytes;
+
use futures::FutureExt;
use futures::TryFutureExt;
use log::debug;
diff --git a/core/src/layers/metrics.rs b/core/src/layers/metrics.rs
index fcc90c81b9..349c8c7658 100644
--- a/core/src/layers/metrics.rs
+++ b/core/src/layers/metrics.rs
@@ -22,7 +22,6 @@ use std::time::Instant;
use async_trait::async_trait;
use bytes::Buf;
-use bytes::Bytes;
use futures::FutureExt;
use futures::TryFutureExt;
use metrics::increment_counter;
diff --git a/core/src/layers/minitrace.rs b/core/src/layers/minitrace.rs
index d829035c03..b4e740b3cb 100644
--- a/core/src/layers/minitrace.rs
+++ b/core/src/layers/minitrace.rs
@@ -19,7 +19,6 @@ use std::fmt::Debug;
use std::future::Future;
use async_trait::async_trait;
-use bytes::Bytes;
use futures::FutureExt;
use minitrace::prelude::*;
diff --git a/core/src/layers/oteltrace.rs b/core/src/layers/oteltrace.rs
index 7c7d71bdda..3949cba765 100644
--- a/core/src/layers/oteltrace.rs
+++ b/core/src/layers/oteltrace.rs
@@ -18,7 +18,6 @@
use std::future::Future;
use async_trait::async_trait;
-use bytes::Bytes;
use futures::FutureExt;
use opentelemetry::global;
use opentelemetry::global::BoxedSpan;
diff --git a/core/src/layers/prometheus.rs b/core/src/layers/prometheus.rs
index d98fd1ad97..b889cdb682 100644
--- a/core/src/layers/prometheus.rs
+++ b/core/src/layers/prometheus.rs
@@ -21,7 +21,6 @@ use std::sync::Arc;
use async_trait::async_trait;
use bytes::Buf;
-use bytes::Bytes;
use futures::FutureExt;
use futures::TryFutureExt;
use log::debug;
diff --git a/core/src/layers/prometheus_client.rs b/core/src/layers/prometheus_client.rs
index 2bbe7bc1c3..78e81dd7fe 100644
--- a/core/src/layers/prometheus_client.rs
+++ b/core/src/layers/prometheus_client.rs
@@ -23,7 +23,6 @@ use std::time::Instant;
use async_trait::async_trait;
use bytes::Buf;
-use bytes::Bytes;
use futures::FutureExt;
use futures::TryFutureExt;
use prometheus_client::metrics::counter::Counter;
diff --git a/core/src/layers/retry.rs b/core/src/layers/retry.rs
index d9c3ecb587..ae97d47e27 100644
--- a/core/src/layers/retry.rs
+++ b/core/src/layers/retry.rs
@@ -24,7 +24,7 @@ use async_trait::async_trait;
use backon::BlockingRetryable;
use backon::ExponentialBuilder;
use backon::Retryable;
-use bytes::Bytes;
+
use futures::FutureExt;
use log::warn;
diff --git a/core/src/layers/throttle.rs b/core/src/layers/throttle.rs
index 61e5e5e014..ff3111b74d 100644
--- a/core/src/layers/throttle.rs
+++ b/core/src/layers/throttle.rs
@@ -20,7 +20,6 @@ use std::sync::Arc;
use std::thread;
use async_trait::async_trait;
-use bytes::Bytes;
use governor::clock::Clock;
use governor::clock::DefaultClock;
use governor::middleware::NoOpMiddleware;
diff --git a/core/src/layers/timeout.rs b/core/src/layers/timeout.rs
index 6b6b976337..91ebb84f65 100644
--- a/core/src/layers/timeout.rs
+++ b/core/src/layers/timeout.rs
@@ -19,7 +19,7 @@ use std::future::Future;
use std::time::Duration;
use async_trait::async_trait;
-use bytes::Bytes;
+
use crate::raw::oio::ListOperation;
use crate::raw::oio::ReadOperation;
diff --git a/core/src/layers/tracing.rs b/core/src/layers/tracing.rs
index b4e11c00e3..1d7f538075 100644
--- a/core/src/layers/tracing.rs
+++ b/core/src/layers/tracing.rs
@@ -19,7 +19,6 @@ use std::fmt::Debug;
use std::future::Future;
use async_trait::async_trait;
-use bytes::Bytes;
use futures::FutureExt;
use tracing::Span;
diff --git a/core/src/raw/enum_utils.rs b/core/src/raw/enum_utils.rs
index 15a68c5469..8d0240d98e 100644
--- a/core/src/raw/enum_utils.rs
+++ b/core/src/raw/enum_utils.rs
@@ -38,7 +38,7 @@
//! This module is used to provide some enums for the above code. We should remove this module once
//! type_alias_impl_trait has been stabilized.
-use bytes::Bytes;
+
use crate::raw::oio::Buffer;
use crate::raw::*;
diff --git a/core/src/raw/oio/write/api.rs b/core/src/raw/oio/write/api.rs
index f7e75beee4..93e1aefb08 100644
--- a/core/src/raw/oio/write/api.rs
+++ b/core/src/raw/oio/write/api.rs
@@ -20,7 +20,7 @@ use std::fmt::Formatter;
use std::future::Future;
use std::ops::DerefMut;
-use bytes::Bytes;
+
use crate::raw::*;
use crate::*;
diff --git a/core/src/raw/oio/write/append_write.rs b/core/src/raw/oio/write/append_write.rs
index b9a340a7b7..f7c99dcc42 100644
--- a/core/src/raw/oio/write/append_write.rs
+++ b/core/src/raw/oio/write/append_write.rs
@@ -17,7 +17,7 @@
use std::future::Future;
-use bytes::Bytes;
+
use crate::raw::*;
use crate::*;
diff --git a/core/src/raw/oio/write/exact_buf_write.rs b/core/src/raw/oio/write/exact_buf_write.rs
index 04fbe73c21..bec4d1d67c 100644
--- a/core/src/raw/oio/write/exact_buf_write.rs
+++ b/core/src/raw/oio/write/exact_buf_write.rs
@@ -15,10 +15,10 @@
// specific language governing permissions and limitations
// under the License.
-use std::mem;
+
use bytes::BufMut;
-use bytes::Bytes;
+
use bytes::{Buf, BytesMut};
use crate::raw::*;
diff --git a/core/src/services/alluxio/writer.rs b/core/src/services/alluxio/writer.rs
index 94c7ca9987..ccb5b6b980 100644
--- a/core/src/services/alluxio/writer.rs
+++ b/core/src/services/alluxio/writer.rs
@@ -17,8 +17,6 @@
use std::sync::Arc;
-use bytes::Bytes;
-
use super::core::AlluxioCore;
use crate::raw::*;
use crate::*;
diff --git a/core/src/services/fs/writer.rs b/core/src/services/fs/writer.rs
index dc4bdb9e2a..52718dc089 100644
--- a/core/src/services/fs/writer.rs
+++ b/core/src/services/fs/writer.rs
@@ -18,7 +18,7 @@
use std::io::Write;
use std::path::PathBuf;
-use bytes::Bytes;
+
use tokio::io::AsyncWriteExt;
use crate::raw::*;
diff --git a/core/src/services/ghac/writer.rs b/core/src/services/ghac/writer.rs
index 0b25ee0066..142a7fa241 100644
--- a/core/src/services/ghac/writer.rs
+++ b/core/src/services/ghac/writer.rs
@@ -15,8 +15,6 @@
// specific language governing permissions and limitations
// under the License.
-use bytes::Bytes;
-
use super::backend::GhacBackend;
use super::error::parse_error;
use crate::raw::*;
diff --git a/core/src/services/hdfs/writer.rs b/core/src/services/hdfs/writer.rs
index 176e60bb7e..ce6b2b0661 100644
--- a/core/src/services/hdfs/writer.rs
+++ b/core/src/services/hdfs/writer.rs
@@ -18,7 +18,6 @@
use std::io::Write;
use std::sync::Arc;
-use bytes::Bytes;
use futures::AsyncWriteExt;
use crate::raw::*;
diff --git a/core/src/services/hdfs_native/writer.rs b/core/src/services/hdfs_native/writer.rs
index 74e0da3168..39b642b421 100644
--- a/core/src/services/hdfs_native/writer.rs
+++ b/core/src/services/hdfs_native/writer.rs
@@ -15,7 +15,6 @@
// specific language governing permissions and limitations
// under the License.
-use bytes::Bytes;
use hdfs_native::file::FileWriter;
use crate::raw::oio;
diff --git a/core/src/services/sftp/writer.rs b/core/src/services/sftp/writer.rs
index fbe9bd0933..960a5e5ebd 100644
--- a/core/src/services/sftp/writer.rs
+++ b/core/src/services/sftp/writer.rs
@@ -17,7 +17,6 @@
use std::pin::Pin;
-use bytes::Bytes;
use openssh_sftp_client::file::File;
use openssh_sftp_client::file::TokioCompatFile;
use tokio::io::AsyncWriteExt;
diff --git a/core/src/types/writer.rs b/core/src/types/writer.rs
index 8079c79421..b7c7d4ef77 100644
--- a/core/src/types/writer.rs
+++ b/core/src/types/writer.rs
@@ -179,7 +179,7 @@ pub mod into_futures_async_write {
use std::task::Context;
use std::task::Poll;
- use bytes::Bytes;
+
use futures::AsyncWrite;
use crate::raw::oio::Write;