This is an automated email from the ASF dual-hosted git repository.
xuanwo pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/opendal.git
The following commit(s) were added to refs/heads/main by this push:
new 278bb919c refactor: Split service cos out of core (#7011)
278bb919c is described below
commit 278bb919c510696587bee96912397aa5d2d5a332
Author: Jintao Zhang <[email protected]>
AuthorDate: Tue Dec 16 19:18:49 2025 +0800
refactor: Split service cos out of core (#7011)
* refactor: Split service cos out of core
Signed-off-by: Jintao Zhang <[email protected]>
* code format
Signed-off-by: Jintao Zhang <[email protected]>
* chore: fix toml format
---------
Signed-off-by: Jintao Zhang <[email protected]>
---
core/Cargo.lock | 23 ++++++++-
core/Cargo.toml | 3 +-
core/core/Cargo.toml | 5 --
core/core/src/services/mod.rs | 5 --
core/services/cos/Cargo.toml | 59 ++++++++++++++++++++++
.../services/cos => services/cos/src}/backend.rs | 11 +++-
.../services/cos => services/cos/src}/config.rs | 12 +++--
.../src/services/cos => services/cos/src}/core.rs | 7 ++-
.../services/cos => services/cos/src}/deleter.rs | 4 +-
.../src/services/cos => services/cos/src}/docs.md | 4 +-
.../src/services/cos => services/cos/src}/error.rs | 6 ++-
.../cos/mod.rs => services/cos/src/lib.rs} | 2 +-
.../services/cos => services/cos/src}/lister.rs | 12 ++---
.../services/cos => services/cos/src}/writer.rs | 8 ++-
core/src/lib.rs | 2 +
15 files changed, 128 insertions(+), 35 deletions(-)
diff --git a/core/Cargo.lock b/core/Cargo.lock
index a4321fdbe..cc0573fdc 100644
--- a/core/Cargo.lock
+++ b/core/Cargo.lock
@@ -1766,7 +1766,7 @@ version = "3.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
checksum = "fde0e0ec90c9dfb3b4b1a0891a7dcd0e2bffde2f7efed5fe7c9bb00e5bfb915e"
dependencies = [
- "windows-sys 0.48.0",
+ "windows-sys 0.59.0",
]
[[package]]
@@ -5558,6 +5558,7 @@ dependencies = [
"opendal-service-azfile",
"opendal-service-b2",
"opendal-service-cloudflare-kv",
+ "opendal-service-cos",
"opendal-service-dashmap",
"opendal-service-fs",
"opendal-service-ftp",
@@ -5984,6 +5985,26 @@ dependencies = [
"serde_json",
]
+[[package]]
+name = "opendal-service-cos"
+version = "0.55.0"
+dependencies = [
+ "base64 0.22.1",
+ "bytes",
+ "ctor",
+ "http 1.4.0",
+ "log",
+ "opendal-core",
+ "pretty_assertions",
+ "quick-xml",
+ "reqsign",
+ "reqwest",
+ "serde",
+ "serde_json",
+ "tokio",
+ "tracing-subscriber",
+]
+
[[package]]
name = "opendal-service-dashmap"
version = "0.55.0"
diff --git a/core/Cargo.toml b/core/Cargo.toml
index 627cc0305..39d007e58 100644
--- a/core/Cargo.toml
+++ b/core/Cargo.toml
@@ -110,7 +110,7 @@ services-b2 = ["dep:opendal-service-b2"]
services-cacache = ["opendal-core/services-cacache"]
services-cloudflare-kv = ["dep:opendal-service-cloudflare-kv"]
services-compfs = ["opendal-core/services-compfs"]
-services-cos = ["opendal-core/services-cos"]
+services-cos = ["dep:opendal-service-cos"]
services-d1 = ["opendal-core/services-d1"]
services-dashmap = ["dep:opendal-service-dashmap"]
services-dbfs = ["opendal-core/services-dbfs"]
@@ -210,6 +210,7 @@ opendal-service-azdls = { path = "services/azdls", version
= "0.55.0", optional
opendal-service-azfile = { path = "services/azfile", version = "0.55.0",
optional = true, default-features = false }
opendal-service-b2 = { path = "services/b2", version = "0.55.0", optional =
true, default-features = false }
opendal-service-cloudflare-kv = { path = "services/cloudflare-kv", version =
"0.55.0", optional = true, default-features = false }
+opendal-service-cos = { path = "services/cos", version = "0.55.0", optional =
true, default-features = false }
opendal-service-dashmap = { path = "services/dashmap", version = "0.55.0",
optional = true, default-features = false }
opendal-service-fs = { path = "services/fs", version = "0.55.0", optional =
true, default-features = false }
opendal-service-ftp = { path = "services/ftp", version = "0.55.0", optional =
true, default-features = false }
diff --git a/core/core/Cargo.toml b/core/core/Cargo.toml
index 009af48c2..57f3082f2 100644
--- a/core/core/Cargo.toml
+++ b/core/core/Cargo.toml
@@ -59,11 +59,6 @@ layers-dtrace = ["dep:probe"]
services-cacache = ["dep:cacache"]
services-compfs = ["dep:compio"]
-services-cos = [
- "dep:reqsign",
- "reqsign?/services-tencent",
- "reqsign?/reqwest_request",
-]
services-d1 = []
services-dbfs = []
services-dropbox = []
diff --git a/core/core/src/services/mod.rs b/core/core/src/services/mod.rs
index daa0838a2..5b3e62463 100644
--- a/core/core/src/services/mod.rs
+++ b/core/core/src/services/mod.rs
@@ -29,11 +29,6 @@ mod compfs;
#[cfg(feature = "services-compfs")]
pub use compfs::*;
-#[cfg(feature = "services-cos")]
-mod cos;
-#[cfg(feature = "services-cos")]
-pub use cos::*;
-
#[cfg(feature = "services-d1")]
mod d1;
#[cfg(feature = "services-d1")]
diff --git a/core/services/cos/Cargo.toml b/core/services/cos/Cargo.toml
new file mode 100644
index 000000000..8de5384d9
--- /dev/null
+++ b/core/services/cos/Cargo.toml
@@ -0,0 +1,59 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+[package]
+description = "Apache OpenDAL COS service implementation"
+name = "opendal-service-cos"
+
+authors = { workspace = true }
+edition = { workspace = true }
+homepage = { workspace = true }
+license = { workspace = true }
+repository = { workspace = true }
+rust-version = { workspace = true }
+version = { workspace = true }
+
+[package.metadata.docs.rs]
+all-features = true
+
+[dependencies]
+opendal-core = { path = "../../core", version = "0.55.0", default-features =
false }
+
+base64 = { workspace = true }
+bytes = { workspace = true }
+ctor = { workspace = true }
+http = { workspace = true }
+log = { workspace = true }
+quick-xml = { workspace = true, features = ["serialize", "overlapped-lists"] }
+reqsign = { workspace = true, default-features = false, features = [
+ "services-tencent",
+ "reqwest_request",
+] }
+reqwest = { version = "0.12.24", features = [
+ "stream",
+], default-features = false }
+serde = { workspace = true, features = ["derive"] }
+
+[dev-dependencies]
+pretty_assertions = "1"
+serde_json = { workspace = true }
+tokio = { workspace = true, features = [
+ "macros",
+ "rt-multi-thread",
+ "io-util",
+] }
+tracing-subscriber = "0.3"
diff --git a/core/core/src/services/cos/backend.rs
b/core/services/cos/src/backend.rs
similarity index 97%
rename from core/core/src/services/cos/backend.rs
rename to core/services/cos/src/backend.rs
index aafd7f368..366592515 100644
--- a/core/core/src/services/cos/backend.rs
+++ b/core/services/cos/src/backend.rs
@@ -36,8 +36,11 @@ use super::lister::CosListers;
use super::lister::CosObjectVersionsLister;
use super::writer::CosWriter;
use super::writer::CosWriters;
-use crate::raw::*;
-use crate::*;
+use opendal_core::raw::*;
+use std::sync::LazyLock;
+
+static GLOBAL_REQWEST_CLIENT: LazyLock<reqwest::Client> =
LazyLock::new(reqwest::Client::new);
+use opendal_core::*;
/// Tencent-Cloud COS services support.
#[doc = include_str!("docs.md")]
@@ -391,6 +394,10 @@ impl Access for CosBackend {
ErrorKind::Unsupported,
"operation is not supported",
)),
+ _ => Err(Error::new(
+ ErrorKind::Unsupported,
+ "operation is not supported",
+ )),
};
let mut req = req?;
self.core.sign_query(&mut req, args.expire()).await?;
diff --git a/core/core/src/services/cos/config.rs
b/core/services/cos/src/config.rs
similarity index 92%
rename from core/core/src/services/cos/config.rs
rename to core/services/cos/src/config.rs
index 059225a11..1e56df0dd 100644
--- a/core/core/src/services/cos/config.rs
+++ b/core/services/cos/src/config.rs
@@ -20,6 +20,10 @@ use std::fmt::Debug;
use serde::Deserialize;
use serde::Serialize;
+use opendal_core::Configurator;
+use opendal_core::OperatorUri;
+use opendal_core::Result;
+
use super::backend::CosBuilder;
/// Tencent-Cloud COS services support.
@@ -54,10 +58,10 @@ impl Debug for CosConfig {
}
}
-impl crate::Configurator for CosConfig {
+impl Configurator for CosConfig {
type Builder = CosBuilder;
- fn from_uri(uri: &crate::types::OperatorUri) -> crate::Result<Self> {
+ fn from_uri(uri: &OperatorUri) -> Result<Self> {
let mut map = uri.options().clone();
if let Some(name) = uri.name() {
@@ -79,8 +83,8 @@ impl crate::Configurator for CosConfig {
#[cfg(test)]
mod tests {
use super::*;
- use crate::Configurator;
- use crate::types::OperatorUri;
+ use opendal_core::Configurator;
+ use opendal_core::OperatorUri;
#[test]
fn from_uri_extracts_bucket_and_root() {
diff --git a/core/core/src/services/cos/core.rs b/core/services/cos/src/core.rs
similarity index 99%
rename from core/core/src/services/cos/core.rs
rename to core/services/cos/src/core.rs
index f601dc6ba..ff7419974 100644
--- a/core/core/src/services/cos/core.rs
+++ b/core/services/cos/src/core.rs
@@ -35,8 +35,11 @@ use reqsign::TencentCosSigner;
use serde::Deserialize;
use serde::Serialize;
-use crate::raw::*;
-use crate::*;
+use opendal_core::Buffer;
+use opendal_core::Error;
+use opendal_core::ErrorKind;
+use opendal_core::Result;
+use opendal_core::raw::*;
pub mod constants {
pub const COS_QUERY_VERSION_ID: &str = "versionId";
diff --git a/core/core/src/services/cos/deleter.rs
b/core/services/cos/src/deleter.rs
similarity index 96%
rename from core/core/src/services/cos/deleter.rs
rename to core/services/cos/src/deleter.rs
index 640efe941..0c31d3548 100644
--- a/core/core/src/services/cos/deleter.rs
+++ b/core/services/cos/src/deleter.rs
@@ -21,8 +21,8 @@ use http::StatusCode;
use super::core::*;
use super::error::parse_error;
-use crate::raw::*;
-use crate::*;
+use opendal_core::Result;
+use opendal_core::raw::*;
pub struct CosDeleter {
core: Arc<CosCore>,
diff --git a/core/core/src/services/cos/docs.md b/core/services/cos/src/docs.md
similarity index 95%
rename from core/core/src/services/cos/docs.md
rename to core/services/cos/src/docs.md
index ff9a2fd6f..c1260a78b 100644
--- a/core/core/src/services/cos/docs.md
+++ b/core/services/cos/src/docs.md
@@ -27,8 +27,8 @@ You can refer to [`CosBuilder`]'s docs for more information
### Via Builder
```rust,no_run
-use anyhow::Result;
-use opendal_core::services::Cos;
+use opendal_core::Result;
+use opendal_service_cos::Cos;
use opendal_core::Operator;
#[tokio::main]
diff --git a/core/core/src/services/cos/error.rs
b/core/services/cos/src/error.rs
similarity index 96%
rename from core/core/src/services/cos/error.rs
rename to core/services/cos/src/error.rs
index 4d767e277..f404d928d 100644
--- a/core/core/src/services/cos/error.rs
+++ b/core/services/cos/src/error.rs
@@ -21,8 +21,10 @@ use http::StatusCode;
use quick_xml::de;
use serde::Deserialize;
-use crate::raw::*;
-use crate::*;
+use opendal_core::Buffer;
+use opendal_core::Error;
+use opendal_core::ErrorKind;
+use opendal_core::raw::*;
/// CosError is the error returned by cos service.
#[derive(Default, Debug, Deserialize)]
diff --git a/core/core/src/services/cos/mod.rs b/core/services/cos/src/lib.rs
similarity index 96%
rename from core/core/src/services/cos/mod.rs
rename to core/services/cos/src/lib.rs
index f2d4ca515..754899b89 100644
--- a/core/core/src/services/cos/mod.rs
+++ b/core/services/cos/src/lib.rs
@@ -18,7 +18,7 @@
/// Default scheme for cos service.
pub const COS_SCHEME: &str = "cos";
-use crate::types::DEFAULT_OPERATOR_REGISTRY;
+use opendal_core::DEFAULT_OPERATOR_REGISTRY;
mod backend;
mod config;
diff --git a/core/core/src/services/cos/lister.rs
b/core/services/cos/src/lister.rs
similarity index 97%
rename from core/core/src/services/cos/lister.rs
rename to core/services/cos/src/lister.rs
index f8112ca64..182a50df7 100644
--- a/core/core/src/services/cos/lister.rs
+++ b/core/services/cos/src/lister.rs
@@ -22,12 +22,12 @@ use quick_xml::de;
use super::core::*;
use super::error::parse_error;
-use crate::EntryMode;
-use crate::Error;
-use crate::Metadata;
-use crate::Result;
-use crate::raw::oio::PageContext;
-use crate::raw::*;
+use opendal_core::EntryMode;
+use opendal_core::Error;
+use opendal_core::Metadata;
+use opendal_core::Result;
+use opendal_core::raw::oio::PageContext;
+use opendal_core::raw::*;
pub type CosListers = TwoWays<oio::PageLister<CosLister>,
oio::PageLister<CosObjectVersionsLister>>;
diff --git a/core/core/src/services/cos/writer.rs
b/core/services/cos/src/writer.rs
similarity index 97%
rename from core/core/src/services/cos/writer.rs
rename to core/services/cos/src/writer.rs
index ddafe7cdc..0e7348aee 100644
--- a/core/core/src/services/cos/writer.rs
+++ b/core/services/cos/src/writer.rs
@@ -24,8 +24,12 @@ use http::StatusCode;
use super::core::*;
use super::error::parse_error;
-use crate::raw::*;
-use crate::*;
+use opendal_core::Buffer;
+use opendal_core::Error;
+use opendal_core::ErrorKind;
+use opendal_core::Metadata;
+use opendal_core::Result;
+use opendal_core::raw::*;
pub type CosWriters = TwoWays<oio::MultipartWriter<CosWriter>,
oio::AppendWriter<CosWriter>>;
diff --git a/core/src/lib.rs b/core/src/lib.rs
index 9091c0d9e..0393688d5 100644
--- a/core/src/lib.rs
+++ b/core/src/lib.rs
@@ -44,6 +44,8 @@ pub mod services {
pub use opendal_service_b2::*;
#[cfg(feature = "services-cloudflare-kv")]
pub use opendal_service_cloudflare_kv::*;
+ #[cfg(feature = "services-cos")]
+ pub use opendal_service_cos::*;
#[cfg(feature = "services-dashmap")]
pub use opendal_service_dashmap::*;
#[cfg(feature = "services-fs")]
