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 109002823 refactor: Split service tikv to new crate (#6997)
109002823 is described below
commit 10900282314afce7b891985a11fd0eb063429773
Author: fenfeng9 <[email protected]>
AuthorDate: Sat Dec 13 00:02:29 2025 +0800
refactor: Split service tikv to new crate (#6997)
refactor(services/tikv): split service into standalone crate
---
core/Cargo.lock | 13 +++++++-
core/Cargo.toml | 3 +-
core/core/Cargo.toml | 3 --
core/core/src/services/mod.rs | 5 ---
core/services/tikv/Cargo.toml | 39 ++++++++++++++++++++++
.../services/tikv => services/tikv/src}/backend.rs | 5 +--
.../services/tikv => services/tikv/src}/config.rs | 8 ++---
.../services/tikv => services/tikv/src}/core.rs | 2 +-
.../services/tikv => services/tikv/src}/deleter.rs | 6 ++--
.../services/tikv => services/tikv/src}/docs.md | 2 +-
.../tikv/mod.rs => services/tikv/src/lib.rs} | 2 +-
.../services/tikv => services/tikv/src}/writer.rs | 4 +--
core/src/lib.rs | 2 ++
13 files changed, 70 insertions(+), 24 deletions(-)
diff --git a/core/Cargo.lock b/core/Cargo.lock
index 39187404b..a2f7917e2 100644
--- a/core/Cargo.lock
+++ b/core/Cargo.lock
@@ -5511,6 +5511,7 @@ dependencies = [
"opendal-service-postgresql",
"opendal-service-s3",
"opendal-service-sled",
+ "opendal-service-tikv",
"opendal-service-vercel-blob",
"opentelemetry",
"opentelemetry-otlp",
@@ -5611,7 +5612,6 @@ dependencies = [
"size",
"sqlx",
"surrealdb",
- "tikv-client",
"tokio",
"tracing-opentelemetry",
"tracing-subscriber",
@@ -6033,6 +6033,17 @@ dependencies = [
"sled",
]
+[[package]]
+name = "opendal-service-tikv"
+version = "0.55.0"
+dependencies = [
+ "ctor",
+ "mea",
+ "opendal-core",
+ "serde",
+ "tikv-client",
+]
+
[[package]]
name = "opendal-service-vercel-blob"
version = "0.55.0"
diff --git a/core/Cargo.toml b/core/Cargo.toml
index 924ea7fd3..84d9a5775 100644
--- a/core/Cargo.toml
+++ b/core/Cargo.toml
@@ -156,7 +156,7 @@ services-sled = ["dep:opendal-service-sled"]
services-sqlite = ["opendal-core/services-sqlite"]
services-surrealdb = ["opendal-core/services-surrealdb"]
services-swift = ["opendal-core/services-swift"]
-services-tikv = ["opendal-core/services-tikv"]
+services-tikv = ["dep:opendal-service-tikv"]
services-upyun = ["opendal-core/services-upyun"]
services-vercel-artifacts = ["opendal-core/services-vercel-artifacts"]
services-vercel-blob = ["dep:opendal-service-vercel-blob"]
@@ -216,6 +216,7 @@ opendal-service-obs = { path = "services/obs", version =
"0.55.0", optional = tr
opendal-service-postgresql = { path = "services/postgresql", version =
"0.55.0", optional = true, default-features = false }
opendal-service-sled = { path = "services/sled", version = "0.55.0", optional
= true, default-features = false }
opendal-service-s3 = { path = "services/s3", version = "0.55.0", optional =
true, default-features = false }
+opendal-service-tikv = { path = "services/tikv", version = "0.55.0", optional
= true, default-features = false }
opendal-service-vercel-blob = { path = "services/vercel-blob", version =
"0.55.0", optional = true, default-features = false }
[dev-dependencies]
diff --git a/core/core/Cargo.toml b/core/core/Cargo.toml
index 59193adaa..26665d932 100644
--- a/core/core/Cargo.toml
+++ b/core/core/Cargo.toml
@@ -133,7 +133,6 @@ services-sftp = ["dep:openssh", "dep:openssh-sftp-client",
"dep:fastpool"]
services-sqlite = ["dep:sqlx", "sqlx?/sqlite", "dep:ouroboros"]
services-surrealdb = ["dep:surrealdb"]
services-swift = []
-services-tikv = ["tikv-client"]
services-upyun = ["dep:hmac", "dep:sha1"]
services-vercel-artifacts = []
services-webdav = []
@@ -237,8 +236,6 @@ redis = { version = "1.0", features = [
], optional = true }
# for services-rocksdb
rocksdb = { version = "0.21.0", default-features = false, optional = true }
-# for services-tikv
-tikv-client = { version = "0.3.0", optional = true, default-features = false }
# for services-hdfs-native
hdfs-native = { version = "0.13", optional = true }
# for services-surrealdb
diff --git a/core/core/src/services/mod.rs b/core/core/src/services/mod.rs
index e293df73e..a5bc5cc87 100644
--- a/core/core/src/services/mod.rs
+++ b/core/core/src/services/mod.rs
@@ -214,11 +214,6 @@ mod swift;
#[cfg(feature = "services-swift")]
pub use self::swift::*;
-#[cfg(feature = "services-tikv")]
-mod tikv;
-#[cfg(feature = "services-tikv")]
-pub use self::tikv::*;
-
#[cfg(feature = "services-upyun")]
mod upyun;
#[cfg(feature = "services-upyun")]
diff --git a/core/services/tikv/Cargo.toml b/core/services/tikv/Cargo.toml
new file mode 100644
index 000000000..1686dc076
--- /dev/null
+++ b/core/services/tikv/Cargo.toml
@@ -0,0 +1,39 @@
+# 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 TiKV service implementation"
+name = "opendal-service-tikv"
+
+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 }
+
+ctor = { workspace = true }
+mea = { version = "0.5.1" }
+serde = { workspace = true, features = ["derive"] }
+tikv-client = { version = "0.3.0", default-features = false }
diff --git a/core/core/src/services/tikv/backend.rs
b/core/services/tikv/src/backend.rs
similarity index 98%
rename from core/core/src/services/tikv/backend.rs
rename to core/services/tikv/src/backend.rs
index ca5c77b26..281dd0b69 100644
--- a/core/core/src/services/tikv/backend.rs
+++ b/core/services/tikv/src/backend.rs
@@ -25,8 +25,9 @@ use super::config::TikvConfig;
use super::core::*;
use super::deleter::TikvDeleter;
use super::writer::TikvWriter;
-use crate::raw::*;
-use crate::*;
+use opendal_core::raw::oio;
+use opendal_core::raw::*;
+use opendal_core::*;
/// TiKV backend builder
#[doc = include_str!("docs.md")]
diff --git a/core/core/src/services/tikv/config.rs
b/core/services/tikv/src/config.rs
similarity index 94%
rename from core/core/src/services/tikv/config.rs
rename to core/services/tikv/src/config.rs
index 622e3faac..fd432d17e 100644
--- a/core/core/src/services/tikv/config.rs
+++ b/core/services/tikv/src/config.rs
@@ -51,10 +51,10 @@ impl Debug for TikvConfig {
}
}
-impl crate::Configurator for TikvConfig {
+impl opendal_core::Configurator for TikvConfig {
type Builder = TikvBuilder;
- fn from_uri(uri: &crate::types::OperatorUri) -> crate::Result<Self> {
+ fn from_uri(uri: &opendal_core::OperatorUri) -> opendal_core::Result<Self>
{
let map = uri.options().clone();
let mut endpoints = Vec::new();
@@ -96,8 +96,8 @@ impl crate::Configurator for TikvConfig {
#[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_collects_endpoints() {
diff --git a/core/core/src/services/tikv/core.rs
b/core/services/tikv/src/core.rs
similarity index 99%
rename from core/core/src/services/tikv/core.rs
rename to core/services/tikv/src/core.rs
index 363bf665e..730bd09c3 100644
--- a/core/core/src/services/tikv/core.rs
+++ b/core/services/tikv/src/core.rs
@@ -22,7 +22,7 @@ use tikv_client::Config;
use tikv_client::RawClient;
use super::TIKV_SCHEME;
-use crate::*;
+use opendal_core::*;
/// TikvCore holds the configuration and client for interacting with TiKV.
#[derive(Clone)]
diff --git a/core/core/src/services/tikv/deleter.rs
b/core/services/tikv/src/deleter.rs
similarity index 94%
rename from core/core/src/services/tikv/deleter.rs
rename to core/services/tikv/src/deleter.rs
index 96903bbae..2c7b89be8 100644
--- a/core/core/src/services/tikv/deleter.rs
+++ b/core/services/tikv/src/deleter.rs
@@ -18,9 +18,9 @@
use std::sync::Arc;
use super::core::*;
-use crate::raw::oio;
-use crate::raw::*;
-use crate::*;
+use opendal_core::raw::oio;
+use opendal_core::raw::*;
+use opendal_core::*;
pub struct TikvDeleter {
core: Arc<TikvCore>,
diff --git a/core/core/src/services/tikv/docs.md
b/core/services/tikv/src/docs.md
similarity index 96%
rename from core/core/src/services/tikv/docs.md
rename to core/services/tikv/src/docs.md
index 09cb8dcb5..c69611f04 100644
--- a/core/core/src/services/tikv/docs.md
+++ b/core/services/tikv/src/docs.md
@@ -28,7 +28,7 @@ You can refer to [`TikvBuilder`]'s docs for more information
```rust,no_run
use anyhow::Result;
-use opendal_core::services::Tikv;
+use opendal_service_tikv::Tikv;
use opendal_core::Operator;
#[tokio::main]
diff --git a/core/core/src/services/tikv/mod.rs b/core/services/tikv/src/lib.rs
similarity index 96%
rename from core/core/src/services/tikv/mod.rs
rename to core/services/tikv/src/lib.rs
index 6bd30e843..4eeb536ef 100644
--- a/core/core/src/services/tikv/mod.rs
+++ b/core/services/tikv/src/lib.rs
@@ -18,7 +18,7 @@
/// Default scheme for tikv service.
pub const TIKV_SCHEME: &str = "tikv";
-use crate::types::DEFAULT_OPERATOR_REGISTRY;
+use opendal_core::DEFAULT_OPERATOR_REGISTRY;
mod backend;
mod config;
diff --git a/core/core/src/services/tikv/writer.rs
b/core/services/tikv/src/writer.rs
similarity index 97%
rename from core/core/src/services/tikv/writer.rs
rename to core/services/tikv/src/writer.rs
index 375b3f0d5..387c3682e 100644
--- a/core/core/src/services/tikv/writer.rs
+++ b/core/services/tikv/src/writer.rs
@@ -18,8 +18,8 @@
use std::sync::Arc;
use super::core::*;
-use crate::raw::oio;
-use crate::*;
+use opendal_core::raw::oio;
+use opendal_core::*;
pub struct TikvWriter {
core: Arc<TikvCore>,
diff --git a/core/src/lib.rs b/core/src/lib.rs
index c9e2b7b30..066ccd442 100644
--- a/core/src/lib.rs
+++ b/core/src/lib.rs
@@ -57,6 +57,8 @@ pub mod services {
pub use opendal_service_s3::*;
#[cfg(feature = "services-sled")]
pub use opendal_service_sled::*;
+ #[cfg(feature = "services-tikv")]
+ pub use opendal_service_tikv::*;
#[cfg(feature = "services-vercel-blob")]
pub use opendal_service_vercel_blob::*;
}
