refactor: Move ops to raw::ops (#2325)

* refactor: Move `ops` to `raw::ops`

Signed-off-by: Xuanwo <[email protected]>

* Add new line for comments

Signed-off-by: Xuanwo <[email protected]>

* Fix build

Signed-off-by: Xuanwo <[email protected]>

---------

Signed-off-by: Xuanwo <[email protected]>

bindings/java/src/blocking_operator.rs

@@ -17,11 +17,15 @@
 
 use std::str::FromStr;
 
-use jni::objects::{JClass, JObject, JString};
-use jni::sys::{jlong, jstring};
+use jni::objects::JClass;
+use jni::objects::JObject;
+use jni::objects::JString;
+use jni::sys::jlong;
+use jni::sys::jstring;
 use jni::JNIEnv;
-
-use opendal::{BlockingOperator, Operator, Scheme};
+use opendal::BlockingOperator;
+use opendal::Operator;
+use opendal::Scheme;
 
 use crate::jmap_to_hashmap;
 use crate::Result;

bindings/java/src/error.rs

@@ -15,10 +15,14 @@
 // specific language governing permissions and limitations
 // under the License.
 
-use jni::objects::{JThrowable, JValue};
+use std::fmt::Debug;
+use std::fmt::Display;
+use std::fmt::Formatter;
+
+use jni::objects::JThrowable;
+use jni::objects::JValue;
 use jni::JNIEnv;
 use opendal::ErrorKind;
-use std::fmt::{Debug, Display, Formatter};
 
 pub(crate) struct Error {
     inner: opendal::Error,

bindings/java/src/lib.rs

@@ -19,10 +19,13 @@ use std::cell::RefCell;
 use std::collections::HashMap;
 use std::ffi::c_void;
 
-use jni::objects::{JMap, JObject, JString};
+use jni::objects::JMap;
+use jni::objects::JObject;
+use jni::objects::JString;
 use jni::sys::jint;
 use jni::sys::JNI_VERSION_1_8;
-use jni::{JNIEnv, JavaVM};
+use jni::JNIEnv;
+use jni::JavaVM;
 use once_cell::sync::OnceCell;
 use tokio::runtime::Builder;
 use tokio::runtime::Runtime;

bindings/java/src/metadata.rs

@@ -16,9 +16,9 @@
 // under the License.
 
 use jni::objects::JClass;
-use jni::sys::{jboolean, jlong};
+use jni::sys::jboolean;
+use jni::sys::jlong;
 use jni::JNIEnv;
-
 use opendal::Metadata;
 
 /// # Safety

bindings/java/src/operator.rs

@@ -17,14 +17,20 @@
 
 use std::str::FromStr;
 
-use jni::objects::{JClass, JObject, JString, JValue, JValueOwned};
+use jni::objects::JClass;
+use jni::objects::JObject;
+use jni::objects::JString;
+use jni::objects::JValue;
+use jni::objects::JValueOwned;
 use jni::sys::jlong;
 use jni::JNIEnv;
+use opendal::Operator;
+use opendal::Scheme;
 
-use opendal::{Operator, Scheme};
-
-use crate::{get_current_env, Result};
-use crate::{jmap_to_hashmap, RUNTIME};
+use crate::get_current_env;
+use crate::jmap_to_hashmap;
+use crate::Result;
+use crate::RUNTIME;
 
 #[no_mangle]
 pub extern "system" fn Java_org_apache_opendal_Operator_constructor(

core/src/layers/chaos.rs

@@ -25,7 +25,6 @@ use futures::FutureExt;
 use rand::prelude::*;
 use rand::rngs::StdRng;
 
-use crate::ops::*;
 use crate::raw::*;
 use crate::*;
 

core/src/layers/complete.rs

@@ -25,7 +25,6 @@ use std::task::Poll;
 use async_trait::async_trait;
 use bytes::Bytes;
 
-use crate::ops::*;
 use crate::raw::oio::into_reader::RangeReader;
 use crate::raw::oio::to_flat_pager;
 use crate::raw::oio::to_hierarchy_pager;

core/src/layers/concurrent_limit.rs

@@ -26,7 +26,6 @@ use bytes::Bytes;
 use tokio::sync::OwnedSemaphorePermit;
 use tokio::sync::Semaphore;
 
-use crate::ops::*;
 use crate::raw::*;
 use crate::*;
 

core/src/layers/error_context.rs

@@ -25,7 +25,6 @@ use async_trait::async_trait;
 use bytes::Bytes;
 use futures::TryFutureExt;
 
-use crate::ops::*;
 use crate::raw::oio::AppendOperation;
 use crate::raw::oio::PageOperation;
 use crate::raw::oio::ReadOperation;

core/src/layers/immutable_index.rs

@@ -21,7 +21,6 @@ use std::mem;
 
 use async_trait::async_trait;
 
-use crate::ops::*;
 use crate::raw::*;
 use crate::*;
 

core/src/layers/logging.rs

@@ -29,7 +29,6 @@ use log::log;
 use log::trace;
 use log::Level;
 
-use crate::ops::*;
 use crate::raw::oio::ReadOperation;
 use crate::raw::oio::WriteOperation;
 use crate::raw::*;

core/src/layers/madsim.rs

@@ -39,7 +39,6 @@ use madsim::net::Endpoint;
 #[cfg(madsim)]
 use madsim::net::Payload;
 
-use crate::ops::*;
 use crate::raw::oio;
 use crate::raw::oio::Entry;
 use crate::raw::*;

core/src/layers/metrics.rs

@@ -33,7 +33,6 @@ use metrics::register_histogram;
 use metrics::Counter;
 use metrics::Histogram;
 
-use crate::ops::*;
 use crate::raw::*;
 use crate::*;
 

core/src/layers/minitrace.rs

@@ -25,7 +25,6 @@ use bytes::Bytes;
 use futures::FutureExt;
 use minitrace::prelude::*;
 
-use crate::ops::*;
 use crate::raw::oio::PageOperation;
 use crate::raw::oio::ReadOperation;
 use crate::raw::oio::WriteOperation;

core/src/layers/oteltrace.rs

@@ -30,7 +30,6 @@ use opentelemetry::trace::Tracer;
 use opentelemetry::Context;
 use opentelemetry::KeyValue;
 
-use crate::ops::*;
 use crate::raw::*;
 use crate::*;
 

core/src/layers/prometheus.rs

@@ -36,7 +36,6 @@ use prometheus::register_int_counter_vec_with_registry;
 use prometheus::HistogramVec;
 use prometheus::Registry;
 
-use crate::ops::*;
 use crate::raw::Accessor;
 use crate::raw::*;
 use crate::*;

core/src/layers/retry.rs

@@ -34,7 +34,6 @@ use bytes::Bytes;
 use futures::FutureExt;
 use log::warn;
 
-use crate::ops::*;
 use crate::raw::oio::AppendOperation;
 use crate::raw::oio::PageOperation;
 use crate::raw::oio::ReadOperation;

core/src/layers/tracing.rs

@@ -25,7 +25,6 @@ use bytes::Bytes;
 use futures::FutureExt;
 use tracing::Span;
 
-use crate::ops::*;
 use crate::raw::*;
 use crate::*;
 

core/src/layers/type_eraser.rs

@@ -20,7 +20,6 @@ use std::fmt::Formatter;
 
 use async_trait::async_trait;
 
-use crate::ops::*;
 use crate::raw::*;
 use crate::*;
 

core/src/raw/accessor.rs

@@ -20,7 +20,6 @@ use std::sync::Arc;
 
 use async_trait::async_trait;
 
-use crate::ops::*;
 use crate::raw::*;
 use crate::*;
 

core/src/raw/adapters/kv/backend.rs

@@ -21,7 +21,6 @@ use async_trait::async_trait;
 use bytes::Bytes;
 
 use super::Adapter;
-use crate::ops::*;
 use crate::raw::*;
 use crate::*;
 

core/src/raw/adapters/typed_kv/backend.rs

@@ -22,7 +22,6 @@ use bytes::Bytes;
 
 use super::Adapter;
 use super::Value;
-use crate::ops::*;
 use crate::raw::oio::VectorCursor;
 use crate::raw::*;
 use crate::*;

core/src/raw/layer.rs

@@ -19,7 +19,6 @@ use std::fmt::Debug;
 
 use async_trait::async_trait;
 
-use crate::ops::*;
 use crate::raw::*;
 use crate::*;
 
@@ -46,7 +45,6 @@ use crate::*;
 /// use std::sync::Arc;
 ///
 /// use async_trait::async_trait;
-/// use opendal::ops::*;
 /// use opendal::raw::*;
 /// use opendal::*;
 ///

core/src/raw/mod.rs

@@ -56,6 +56,9 @@ pub use version::VERSION;
 mod rps;
 pub use rps::*;
 
+mod ops;
+pub use ops::*;
+
 mod http_util;
 pub use http_util::*;
 

core/src/raw/oio/into_reader/by_range.rs

@@ -27,7 +27,6 @@ use std::task::Poll;
 use futures::future::BoxFuture;
 use tokio::io::ReadBuf;
 
-use crate::ops::*;
 use crate::raw::*;
 use crate::*;
 

core/src/raw/oio/to_flat_pager.rs

@@ -20,7 +20,6 @@ use std::mem;
 
 use async_trait::async_trait;
 
-use crate::ops::*;
 use crate::raw::*;
 use crate::*;
 

core/src/services/azblob/appender.rs

@@ -23,7 +23,6 @@ use http::StatusCode;
 
 use super::core::*;
 use super::error::parse_error;
-use crate::ops::OpAppend;
 use crate::raw::*;
 use crate::*;
 

core/src/services/azblob/backend.rs

@@ -33,7 +33,6 @@ use super::batch::parse_batch_delete_response;
 use super::error::parse_error;
 use super::pager::AzblobPager;
 use super::writer::AzblobWriter;
-use crate::ops::*;
 use crate::raw::*;
 use crate::services::azblob::core::AzblobCore;
 use crate::types::Metadata;
@@ -52,7 +51,6 @@ const KNOWN_AZBLOB_ENDPOINT_SUFFIX: &[&str] = &[
 const AZBLOB_BATCH_LIMIT: usize = 256;
 
 /// Azure Storage Blob services support.
-///
 #[doc = include_str!("docs.md")]
 #[derive(Default, Clone)]
 pub struct AzblobBuilder {

core/src/services/azblob/writer.rs

@@ -23,7 +23,6 @@ use http::StatusCode;
 
 use super::core::AzblobCore;
 use super::error::parse_error;
-use crate::ops::OpWrite;
 use crate::raw::*;
 use crate::*;
 

core/src/services/azdfs/backend.rs

@@ -31,7 +31,6 @@ use super::core::AzdfsCore;
 use super::error::parse_error;
 use super::pager::AzdfsPager;
 use super::writer::AzdfsWriter;
-use crate::ops::*;
 use crate::raw::*;
 use crate::*;
 

core/src/services/azdfs/writer.rs

@@ -23,7 +23,6 @@ use http::StatusCode;
 
 use super::core::AzdfsCore;
 use super::error::parse_error;
-use crate::ops::OpWrite;
 use crate::raw::*;
 use crate::*;
 

core/src/services/cos/backend.rs

@@ -31,7 +31,6 @@ use super::core::CosCore;
 use super::error::parse_error;
 use super::pager::CosPager;
 use super::writer::CosWriter;
-use crate::ops::*;
 use crate::raw::*;
 use crate::*;
 

core/src/services/cos/writer.rs

@@ -23,7 +23,6 @@ use http::StatusCode;
 
 use super::core::CosCore;
 use super::error::parse_error;
-use crate::ops::OpWrite;
 use crate::raw::*;
 use crate::*;
 

core/src/services/fs/appender.rs

@@ -17,7 +17,6 @@
 
 use async_trait::async_trait;
 use bytes::Bytes;
-
 use tokio::io::AsyncWriteExt;
 
 use super::error::parse_io_error;

core/src/services/fs/backend.rs

@@ -31,7 +31,6 @@ use super::appender::FsAppender;
 use super::error::parse_io_error;
 use super::pager::FsPager;
 use super::writer::FsWriter;
-use crate::ops::*;
 use crate::raw::*;
 use crate::*;
 

core/src/services/ftp/backend.rs

@@ -41,7 +41,6 @@ use tokio::sync::OnceCell;
 use super::pager::FtpPager;
 use super::util::FtpReader;
 use super::writer::FtpWriter;
-use crate::ops::*;
 use crate::raw::*;
 use crate::*;
 

core/src/services/gcs/backend.rs

@@ -35,7 +35,6 @@ use super::core::GcsCore;
 use super::error::parse_error;
 use super::pager::GcsPager;
 use super::writer::GcsWriter;
-use crate::ops::*;
 use crate::raw::*;
 use crate::*;
 

core/src/services/gcs/writer.rs

@@ -23,7 +23,6 @@ use http::StatusCode;
 
 use super::core::GcsCore;
 use super::error::parse_error;
-use crate::ops::OpWrite;
 use crate::raw::*;
 use crate::*;
 

core/src/services/gdrive/backend.rs

@@ -24,17 +24,7 @@ use http::StatusCode;
 use super::core::GdriveCore;
 use super::error::parse_error;
 use super::writer::GdriveWriter;
-use crate::ops::OpDelete;
-use crate::ops::OpRead;
-use crate::ops::OpWrite;
-use crate::raw::parse_into_metadata;
-use crate::raw::Accessor;
-use crate::raw::AccessorInfo;
-use crate::raw::HttpClient;
-use crate::raw::IncomingAsyncBody;
-use crate::raw::RpDelete;
-use crate::raw::RpRead;
-use crate::raw::RpWrite;
+use crate::raw::*;
 use crate::types::Result;
 use crate::Capability;
 use crate::Error;

core/src/services/gdrive/writer.rs

@@ -23,7 +23,6 @@ use http::StatusCode;
 
 use super::core::GdriveCore;
 use super::error::parse_error;
-use crate::ops::OpWrite;
 use crate::raw::*;
 use crate::*;