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 003204d1b refactor: Split service cloudflare-kv out of core (#6974)
003204d1b is described below
commit 003204d1bfd7ece41af943187ce42ad0fb6cdacf
Author: Jintao Zhang <[email protected]>
AuthorDate: Thu Dec 11 22:30:57 2025 +0800
refactor: Split service cloudflare-kv out of core (#6974)
* refactor: Split service cloudflare-kv out of core
Signed-off-by: Jintao Zhang <[email protected]>
* revert comments
Signed-off-by: Jintao Zhang <[email protected]>
* cargo fmt
Signed-off-by: Jintao Zhang <[email protected]>
---------
Signed-off-by: Jintao Zhang <[email protected]>
---
core/Cargo.lock | 14 ++++++++
core/Cargo.toml | 3 +-
core/core/Cargo.toml | 1 -
core/core/src/services/mod.rs | 5 ---
core/services/cloudflare-kv/Cargo.toml | 41 ++++++++++++++++++++++
.../cloudflare-kv/src}/backend.rs | 4 +--
.../cloudflare-kv/src}/config.rs | 22 ++++++------
.../cloudflare-kv/src}/core.rs | 6 ++--
.../cloudflare-kv/src}/deleter.rs | 8 ++---
.../cloudflare-kv/src}/docs.md | 0
.../cloudflare-kv/src}/error.rs | 4 +--
.../mod.rs => services/cloudflare-kv/src/lib.rs} | 14 ++++----
.../cloudflare-kv/src}/lister.rs | 6 ++--
.../cloudflare-kv/src}/model.rs | 2 --
.../cloudflare-kv/src}/writer.rs | 9 ++---
core/src/lib.rs | 2 ++
16 files changed, 97 insertions(+), 44 deletions(-)
diff --git a/core/Cargo.lock b/core/Cargo.lock
index 46b16d2eb..f3192f4f1 100644
--- a/core/Cargo.lock
+++ b/core/Cargo.lock
@@ -5499,6 +5499,7 @@ dependencies = [
"opendal-service-azblob",
"opendal-service-azdls",
"opendal-service-azfile",
+ "opendal-service-cloudflare-kv",
"opendal-service-ghac",
"opendal-service-hdfs-native",
"opendal-service-moka",
@@ -5863,6 +5864,19 @@ dependencies = [
"reqsign",
]
+[[package]]
+name = "opendal-service-cloudflare-kv"
+version = "0.55.0"
+dependencies = [
+ "bytes",
+ "ctor",
+ "http 1.4.0",
+ "log",
+ "opendal-core",
+ "serde",
+ "serde_json",
+]
+
[[package]]
name = "opendal-service-ghac"
version = "0.55.0"
diff --git a/core/Cargo.toml b/core/Cargo.toml
index 76a8b4a04..2cad7d6c6 100644
--- a/core/Cargo.toml
+++ b/core/Cargo.toml
@@ -110,7 +110,7 @@ services-azdls = ["dep:opendal-service-azdls"]
services-azfile = ["dep:opendal-service-azfile"]
services-b2 = ["opendal-core/services-b2"]
services-cacache = ["opendal-core/services-cacache"]
-services-cloudflare-kv = ["opendal-core/services-cloudflare-kv"]
+services-cloudflare-kv = ["dep:opendal-service-cloudflare-kv"]
services-compfs = ["opendal-core/services-compfs"]
services-cos = ["opendal-core/services-cos"]
services-d1 = ["opendal-core/services-d1"]
@@ -206,6 +206,7 @@ opendal-service-aliyun-drive = { path =
"services/aliyun-drive", version = "0.55
opendal-service-azblob = { path = "services/azblob", version = "0.55.0",
optional = true, default-features = false }
opendal-service-azdls = { path = "services/azdls", version = "0.55.0",
optional = true, default-features = false }
opendal-service-azfile = { path = "services/azfile", 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-ghac = { path = "services/ghac", version = "0.55.0", optional
= true, default-features = false }
opendal-service-hdfs-native = { path = "services/hdfs-native", version =
"0.55.0", optional = true, default-features = false }
opendal-service-moka = { path = "services/moka", version = "0.55.0", optional
= true, default-features = false }
diff --git a/core/core/Cargo.toml b/core/core/Cargo.toml
index 53bab3070..265f78f88 100644
--- a/core/core/Cargo.toml
+++ b/core/core/Cargo.toml
@@ -80,7 +80,6 @@ layers-dtrace = ["dep:probe"]
services-alluxio = []
services-b2 = []
services-cacache = ["dep:cacache"]
-services-cloudflare-kv = []
services-compfs = ["dep:compio"]
services-cos = [
"dep:reqsign",
diff --git a/core/core/src/services/mod.rs b/core/core/src/services/mod.rs
index acd629b4b..74f0473e3 100644
--- a/core/core/src/services/mod.rs
+++ b/core/core/src/services/mod.rs
@@ -34,11 +34,6 @@ mod cacache;
#[cfg(feature = "services-cacache")]
pub use self::cacache::*;
-#[cfg(feature = "services-cloudflare-kv")]
-mod cloudflare_kv;
-#[cfg(feature = "services-cloudflare-kv")]
-pub use self::cloudflare_kv::*;
-
#[cfg(feature = "services-compfs")]
mod compfs;
#[cfg(feature = "services-compfs")]
diff --git a/core/services/cloudflare-kv/Cargo.toml
b/core/services/cloudflare-kv/Cargo.toml
new file mode 100644
index 000000000..b8d9408fe
--- /dev/null
+++ b/core/services/cloudflare-kv/Cargo.toml
@@ -0,0 +1,41 @@
+# 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 Cloudflare KV service implementation"
+name = "opendal-service-cloudflare-kv"
+
+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 }
+
+bytes = { workspace = true }
+ctor = { workspace = true }
+http = { workspace = true }
+log = { workspace = true }
+serde = { workspace = true, features = ["derive"] }
+serde_json = { workspace = true }
diff --git a/core/core/src/services/cloudflare_kv/backend.rs
b/core/services/cloudflare-kv/src/backend.rs
similarity index 99%
rename from core/core/src/services/cloudflare_kv/backend.rs
rename to core/services/cloudflare-kv/src/backend.rs
index 49546af3c..ee3610b44 100644
--- a/core/core/src/services/cloudflare_kv/backend.rs
+++ b/core/services/cloudflare-kv/src/backend.rs
@@ -20,6 +20,8 @@ use std::sync::Arc;
use bytes::Buf;
use http::StatusCode;
+use opendal_core::raw::*;
+use opendal_core::*;
use super::CLOUDFLARE_KV_SCHEME;
use super::config::CloudflareKvConfig;
@@ -29,8 +31,6 @@ use super::error::parse_error;
use super::lister::CloudflareKvLister;
use super::model::*;
use super::writer::CloudflareWriter;
-use crate::raw::*;
-use crate::*;
#[doc = include_str!("docs.md")]
#[derive(Default)]
diff --git a/core/core/src/services/cloudflare_kv/config.rs
b/core/services/cloudflare-kv/src/config.rs
similarity index 88%
rename from core/core/src/services/cloudflare_kv/config.rs
rename to core/services/cloudflare-kv/src/config.rs
index 284fe8540..33a67ce79 100644
--- a/core/core/src/services/cloudflare_kv/config.rs
+++ b/core/services/cloudflare-kv/src/config.rs
@@ -17,12 +17,12 @@
use std::fmt::Debug;
+use opendal_core::raw::*;
use serde::Deserialize;
use serde::Serialize;
use super::CLOUDFLARE_KV_SCHEME;
use super::backend::CloudflareKvBuilder;
-use crate::raw::*;
/// Cloudflare KV Service Support.
#[derive(Default, Serialize, Deserialize, Clone, PartialEq, Eq)]
@@ -51,21 +51,21 @@ impl Debug for CloudflareKvConfig {
}
}
-impl crate::Configurator for CloudflareKvConfig {
+impl opendal_core::Configurator for CloudflareKvConfig {
type Builder = CloudflareKvBuilder;
- fn from_uri(uri: &crate::types::OperatorUri) -> crate::Result<Self> {
+ fn from_uri(uri: &opendal_core::OperatorUri) -> opendal_core::Result<Self>
{
let account_id = uri.name().ok_or_else(|| {
- crate::Error::new(
- crate::ErrorKind::ConfigInvalid,
+ opendal_core::Error::new(
+ opendal_core::ErrorKind::ConfigInvalid,
"uri host must contain account id",
)
.with_context("service", CLOUDFLARE_KV_SCHEME)
})?;
let raw_root = uri.root().ok_or_else(|| {
- crate::Error::new(
- crate::ErrorKind::ConfigInvalid,
+ opendal_core::Error::new(
+ opendal_core::ErrorKind::ConfigInvalid,
"uri path must contain namespace id",
)
.with_context("service", CLOUDFLARE_KV_SCHEME)
@@ -73,8 +73,8 @@ impl crate::Configurator for CloudflareKvConfig {
let mut segments = raw_root.splitn(2, '/');
let namespace_id = segments.next().filter(|s|
!s.is_empty()).ok_or_else(|| {
- crate::Error::new(
- crate::ErrorKind::ConfigInvalid,
+ opendal_core::Error::new(
+ opendal_core::ErrorKind::ConfigInvalid,
"namespace id is required in uri path",
)
.with_context("service", CLOUDFLARE_KV_SCHEME)
@@ -101,8 +101,8 @@ impl crate::Configurator for CloudflareKvConfig {
#[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_ids_and_root() {
diff --git a/core/core/src/services/cloudflare_kv/core.rs
b/core/services/cloudflare-kv/src/core.rs
similarity index 97%
rename from core/core/src/services/cloudflare_kv/core.rs
rename to core/services/cloudflare-kv/src/core.rs
index fa1069b17..3f8390c8a 100644
--- a/core/core/src/services/cloudflare_kv/core.rs
+++ b/core/services/cloudflare-kv/src/core.rs
@@ -21,11 +21,11 @@ use http::Request;
use http::Response;
use http::header;
use http::request;
+use opendal_core::raw::*;
+use opendal_core::{Buffer, Result};
use serde_json::json;
-use crate::raw::*;
-use crate::services::cloudflare_kv::model::CfKvMetadata;
-use crate::{Buffer, Result};
+use crate::model::CfKvMetadata;
#[derive(Debug, Clone)]
pub struct CloudflareKvCore {
diff --git a/core/core/src/services/cloudflare_kv/deleter.rs
b/core/services/cloudflare-kv/src/deleter.rs
similarity index 96%
rename from core/core/src/services/cloudflare_kv/deleter.rs
rename to core/services/cloudflare-kv/src/deleter.rs
index 1e21e0c2a..c63ac54e6 100644
--- a/core/core/src/services/cloudflare_kv/deleter.rs
+++ b/core/services/cloudflare-kv/src/deleter.rs
@@ -19,13 +19,13 @@ use std::sync::Arc;
use bytes::Buf;
use http::StatusCode;
+use opendal_core::raw::oio::BatchDeleteResult;
+use opendal_core::raw::*;
+use opendal_core::*;
use super::core::*;
use super::error::parse_error;
-use crate::raw::oio::BatchDeleteResult;
-use crate::raw::*;
-use crate::services::cloudflare_kv::model::CfKvDeleteResponse;
-use crate::*;
+use super::model::CfKvDeleteResponse;
pub struct CloudflareKvDeleter {
core: Arc<CloudflareKvCore>,
diff --git a/core/core/src/services/cloudflare_kv/docs.md
b/core/services/cloudflare-kv/src/docs.md
similarity index 100%
rename from core/core/src/services/cloudflare_kv/docs.md
rename to core/services/cloudflare-kv/src/docs.md
diff --git a/core/core/src/services/cloudflare_kv/error.rs
b/core/services/cloudflare-kv/src/error.rs
similarity index 98%
rename from core/core/src/services/cloudflare_kv/error.rs
rename to core/services/cloudflare-kv/src/error.rs
index a86f3bf0f..d767422c8 100644
--- a/core/core/src/services/cloudflare_kv/error.rs
+++ b/core/services/cloudflare-kv/src/error.rs
@@ -18,12 +18,12 @@
use bytes::Buf;
use http::Response;
use http::StatusCode;
+use opendal_core::raw::*;
+use opendal_core::*;
use serde_json::de;
use super::model::CfKvError;
use super::model::CfKvResponse;
-use crate::raw::*;
-use crate::*;
/// Parse error response into Error.
pub(super) fn parse_error(resp: Response<Buffer>) -> Error {
diff --git a/core/core/src/services/cloudflare_kv/mod.rs
b/core/services/cloudflare-kv/src/lib.rs
similarity index 81%
rename from core/core/src/services/cloudflare_kv/mod.rs
rename to core/services/cloudflare-kv/src/lib.rs
index 5f5d7ae1f..fc0d489e0 100644
--- a/core/core/src/services/cloudflare_kv/mod.rs
+++ b/core/services/cloudflare-kv/src/lib.rs
@@ -15,10 +15,9 @@
// specific language governing permissions and limitations
// under the License.
-/// Default scheme for cloudflare-kv service.
-pub const CLOUDFLARE_KV_SCHEME: &str = "cloudflare-kv";
-
-use crate::types::DEFAULT_OPERATOR_REGISTRY;
+#![cfg_attr(docsrs, feature(doc_cfg))]
+//! Cloudflare KV service implementation for Apache OpenDAL.
+#![deny(missing_docs)]
mod backend;
mod config;
@@ -32,7 +31,10 @@ mod writer;
pub use backend::CloudflareKvBuilder as CloudflareKv;
pub use config::CloudflareKvConfig;
+/// Default scheme for cloudflare-kv service.
+pub const CLOUDFLARE_KV_SCHEME: &str = "cloudflare-kv";
+
#[ctor::ctor]
-fn register_cloudflarekv_service() {
- DEFAULT_OPERATOR_REGISTRY.register::<CloudflareKv>(CLOUDFLARE_KV_SCHEME);
+fn register_cloudflare_kv_service() {
+
opendal_core::DEFAULT_OPERATOR_REGISTRY.register::<CloudflareKv>(CLOUDFLARE_KV_SCHEME);
}
diff --git a/core/core/src/services/cloudflare_kv/lister.rs
b/core/services/cloudflare-kv/src/lister.rs
similarity index 97%
rename from core/core/src/services/cloudflare_kv/lister.rs
rename to core/services/cloudflare-kv/src/lister.rs
index 1eeca9906..ff652b019 100644
--- a/core/core/src/services/cloudflare_kv/lister.rs
+++ b/core/services/cloudflare-kv/src/lister.rs
@@ -18,12 +18,12 @@
use std::sync::Arc;
use bytes::Buf;
+use opendal_core::raw::*;
+use opendal_core::*;
use super::core::CloudflareKvCore;
use super::error::parse_error;
-use crate::raw::*;
-use crate::services::cloudflare_kv::model::{CfKvListKey, CfKvListResponse};
-use crate::*;
+use super::model::{CfKvListKey, CfKvListResponse};
pub struct CloudflareKvLister {
core: Arc<CloudflareKvCore>,
diff --git a/core/core/src/services/cloudflare_kv/model.rs
b/core/services/cloudflare-kv/src/model.rs
similarity index 98%
rename from core/core/src/services/cloudflare_kv/model.rs
rename to core/services/cloudflare-kv/src/model.rs
index 390f11d82..2e78c3255 100644
--- a/core/core/src/services/cloudflare_kv/model.rs
+++ b/core/services/cloudflare-kv/src/model.rs
@@ -15,8 +15,6 @@
// specific language governing permissions and limitations
// under the License.
-// use std::collections::HashMap;
-
use serde::{Deserialize, Serialize};
#[derive(Debug, Deserialize)]
diff --git a/core/core/src/services/cloudflare_kv/writer.rs
b/core/services/cloudflare-kv/src/writer.rs
similarity index 95%
rename from core/core/src/services/cloudflare_kv/writer.rs
rename to core/services/cloudflare-kv/src/writer.rs
index c644611bd..795573c50 100644
--- a/core/core/src/services/cloudflare_kv/writer.rs
+++ b/core/services/cloudflare-kv/src/writer.rs
@@ -17,12 +17,13 @@
use std::sync::Arc;
+use http::StatusCode;
+use opendal_core::raw::*;
+use opendal_core::*;
+
use super::core::CloudflareKvCore;
use super::error::parse_error;
-use crate::raw::*;
-use crate::services::cloudflare_kv::model::CfKvMetadata;
-use crate::*;
-use http::StatusCode;
+use super::model::CfKvMetadata;
pub struct CloudflareWriter {
core: Arc<CloudflareKvCore>,
diff --git a/core/src/lib.rs b/core/src/lib.rs
index 080e141ac..ce3c042cf 100644
--- a/core/src/lib.rs
+++ b/core/src/lib.rs
@@ -35,6 +35,8 @@ pub mod services {
pub use opendal_service_azdls::*;
#[cfg(feature = "services-azfile")]
pub use opendal_service_azfile::*;
+ #[cfg(feature = "services-cloudflare-kv")]
+ pub use opendal_service_cloudflare_kv::*;
#[cfg(feature = "services-ghac")]
pub use opendal_service_ghac::*;
#[cfg(feature = "services-hdfs-native")]
