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 6ee74a525 refactor(services/moka): Move services moka out as a crate
(#6868)
6ee74a525 is described below
commit 6ee74a52512ad0fd6e3f2ed3a79932fd23fda774
Author: manchangfengxu <[email protected]>
AuthorDate: Fri Dec 5 22:36:05 2025 +0800
refactor(services/moka): Move services moka out as a crate (#6868)
This commit extracts the moka service into its own crate,
`opendal-service-moka`, following the established service splitting pattern.
The changes primarily involve moving the source files and updating Cargo
configurations accordingly.
Signed-off-by: manchangfengxu <[email protected]>
---
core/Cargo.lock | 12 ++++++++
core/Cargo.toml | 3 +-
core/core/Cargo.toml | 1 -
core/core/src/services/mod.rs | 5 ----
core/services/moka/Cargo.toml | 34 ++++++++++++++++++++++
.../services/moka => services/moka/src}/backend.rs | 10 +++----
.../services/moka => services/moka/src}/config.rs | 17 ++++++-----
.../services/moka => services/moka/src}/core.rs | 2 +-
.../services/moka => services/moka/src}/deleter.rs | 6 ++--
.../services/moka => services/moka/src}/docs.md | 2 +-
.../moka/mod.rs => services/moka/src/lib.rs} | 12 ++++----
.../services/moka => services/moka/src}/lister.rs | 6 ++--
.../services/moka => services/moka/src}/writer.rs | 6 ++--
core/src/lib.rs | 2 ++
14 files changed, 82 insertions(+), 36 deletions(-)
diff --git a/core/Cargo.lock b/core/Cargo.lock
index 597d41511..6ed89eba4 100644
--- a/core/Cargo.lock
+++ b/core/Cargo.lock
@@ -5407,6 +5407,7 @@ dependencies = [
"log",
"opendal-core",
"opendal-layer-async-backtrace",
+ "opendal-service-moka",
"opendal-service-s3",
"opentelemetry",
"opentelemetry-otlp",
@@ -5584,6 +5585,17 @@ dependencies = [
"opendal-core",
]
+[[package]]
+name = "opendal-service-moka"
+version = "0.55.0"
+dependencies = [
+ "ctor",
+ "log",
+ "moka",
+ "opendal-core",
+ "serde",
+]
+
[[package]]
name = "opendal-service-s3"
version = "0.55.0"
diff --git a/core/Cargo.toml b/core/Cargo.toml
index ed742214f..329ef377d 100644
--- a/core/Cargo.toml
+++ b/core/Cargo.toml
@@ -101,7 +101,7 @@ services-lakefs = ["opendal-core/services-lakefs"]
services-memcached = ["opendal-core/services-memcached"]
services-memory = ["opendal-core/services-memory"]
services-mini-moka = ["opendal-core/services-mini-moka"]
-services-moka = ["opendal-core/services-moka"]
+services-moka = ["dep:opendal-service-moka"]
services-mongodb = ["opendal-core/services-mongodb"]
services-monoiofs = ["opendal-core/services-monoiofs"]
services-mysql = ["opendal-core/services-mysql"]
@@ -154,6 +154,7 @@ required-features = ["tests"]
opendal-core = { path = "core", version = "0.55.0", default-features = false }
opendal-layer-async-backtrace = { path = "layers/async-backtrace", 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-moka = { path = "services/moka", version = "0.55.0", optional
= true, default-features = false }
[dev-dependencies]
anyhow = { version = "1.0.100", features = ["std"] }
diff --git a/core/core/Cargo.toml b/core/core/Cargo.toml
index f186ec679..768d7f292 100644
--- a/core/core/Cargo.toml
+++ b/core/core/Cargo.toml
@@ -160,7 +160,6 @@ services-lakefs = []
services-memcached = ["dep:fastpool"]
services-memory = []
services-mini-moka = ["dep:mini-moka"]
-services-moka = ["dep:moka"]
services-mongodb = ["dep:mongodb", "dep:mongodb-internal-macros"]
services-monoiofs = ["dep:monoio", "dep:flume"]
services-mysql = ["dep:sqlx", "sqlx?/mysql"]
diff --git a/core/core/src/services/mod.rs b/core/core/src/services/mod.rs
index dd232fa2a..23db1ae87 100644
--- a/core/core/src/services/mod.rs
+++ b/core/core/src/services/mod.rs
@@ -189,11 +189,6 @@ mod mini_moka;
#[cfg(feature = "services-mini-moka")]
pub use self::mini_moka::*;
-#[cfg(feature = "services-moka")]
-mod moka;
-#[cfg(feature = "services-moka")]
-pub use self::moka::*;
-
#[cfg(feature = "services-mongodb")]
mod mongodb;
#[cfg(feature = "services-mongodb")]
diff --git a/core/services/moka/Cargo.toml b/core/services/moka/Cargo.toml
new file mode 100644
index 000000000..4bcec0d1c
--- /dev/null
+++ b/core/services/moka/Cargo.toml
@@ -0,0 +1,34 @@
+# 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]
+name = "opendal-service-moka"
+version = "0.55.0"
+edition = "2024"
+license = "Apache-2.0"
+repository = "https://github.com/apache/opendal";
+description = "Apache OpenDAL Moka service implementation"
+
+[package.metadata.docs.rs]
+all-features = true
+
+[dependencies]
+opendal-core = { path = "../../core", version = "0.55.0", default-features =
false }
+log = "0.4"
+serde = { version = "1", features = ["derive"] }
+moka = { version = "0.12", features = ["future", "sync"] }
+ctor = "0.6"
diff --git a/core/core/src/services/moka/backend.rs
b/core/services/moka/src/backend.rs
similarity index 98%
rename from core/core/src/services/moka/backend.rs
rename to core/services/moka/src/backend.rs
index 335a4ac1b..e01387a1d 100644
--- a/core/core/src/services/moka/backend.rs
+++ b/core/services/moka/src/backend.rs
@@ -26,8 +26,8 @@ use super::core::*;
use super::deleter::MokaDeleter;
use super::lister::MokaLister;
use super::writer::MokaWriter;
-use crate::raw::*;
-use crate::*;
+use opendal_core::raw::*;
+use opendal_core::*;
/// Type alias of
[`moka::future::Cache`](https://docs.rs/moka/latest/moka/future/struct.Cache.html)
pub type MokaCache<K, V> = moka::future::Cache<K, V>;
@@ -62,9 +62,9 @@ impl MokaBuilder {
/// # use std::time::Duration;
/// # use log::debug;
/// # use moka::notification::RemovalCause;
- /// # use opendal_core::services::Moka;
- /// # use opendal_core::services::MokaCacheBuilder;
- /// # use opendal_core::services::MokaValue;
+ /// # use opendal_service_moka::Moka;
+ /// # use opendal_service_moka::MokaCacheBuilder;
+ /// # use opendal_service_moka::MokaValue;
/// # use opendal_core::Configurator;
/// let moka = Moka::new(
/// MokaCacheBuilder::<String, MokaValue>::default()
diff --git a/core/core/src/services/moka/config.rs
b/core/services/moka/src/config.rs
similarity index 88%
rename from core/core/src/services/moka/config.rs
rename to core/services/moka/src/config.rs
index fb0f4b998..4692900fa 100644
--- a/core/core/src/services/moka/config.rs
+++ b/core/services/moka/src/config.rs
@@ -19,6 +19,7 @@ use serde::Deserialize;
use serde::Serialize;
use super::backend::MokaBuilder;
+use opendal_core::{Configurator, OperatorUri, Result};
/// Config for Moka services support.
#[derive(Default, Debug, Serialize, Deserialize, Clone, PartialEq, Eq)]
@@ -44,20 +45,20 @@ pub struct MokaConfig {
pub root: Option<String>,
}
-impl crate::Configurator for MokaConfig {
+impl Configurator for MokaConfig {
type Builder = MokaBuilder;
- 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.option("name") {
map.insert("name".to_string(), name.to_string());
}
- if let Some(root) = uri.root() {
- if !root.is_empty() {
- map.insert("root".to_string(), root.to_string());
- }
+ if let Some(root) = uri.root()
+ && !root.is_empty()
+ {
+ map.insert("root".to_string(), root.to_string());
}
Self::from_iter(map)
@@ -74,8 +75,8 @@ impl crate::Configurator for MokaConfig {
#[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_sets_name_and_root() {
diff --git a/core/core/src/services/moka/core.rs
b/core/services/moka/src/core.rs
similarity index 98%
rename from core/core/src/services/moka/core.rs
rename to core/services/moka/src/core.rs
index b46bdfbaa..8ba6c9cc4 100644
--- a/core/core/src/services/moka/core.rs
+++ b/core/services/moka/src/core.rs
@@ -19,7 +19,7 @@ use std::fmt::Debug;
use moka::future::Cache;
-use crate::*;
+use opendal_core::*;
/// Value stored in moka cache containing both metadata and content
#[derive(Clone)]
diff --git a/core/core/src/services/moka/deleter.rs
b/core/services/moka/src/deleter.rs
similarity index 94%
rename from core/core/src/services/moka/deleter.rs
rename to core/services/moka/src/deleter.rs
index ced453f28..8ce9b298a 100644
--- a/core/core/src/services/moka/deleter.rs
+++ b/core/services/moka/src/deleter.rs
@@ -18,9 +18,9 @@
use std::sync::Arc;
use super::core::MokaCore;
-use crate::raw::oio;
-use crate::raw::*;
-use crate::*;
+use opendal_core::raw::oio;
+use opendal_core::raw::*;
+use opendal_core::*;
pub struct MokaDeleter {
core: Arc<MokaCore>,
diff --git a/core/core/src/services/moka/docs.md
b/core/services/moka/src/docs.md
similarity index 95%
rename from core/core/src/services/moka/docs.md
rename to core/services/moka/src/docs.md
index 5f6670f27..cf1b63521 100644
--- a/core/core/src/services/moka/docs.md
+++ b/core/services/moka/src/docs.md
@@ -27,7 +27,7 @@ You can refer to [`MokaBuilder`]'s docs for more information
```rust,no_run
use anyhow::Result;
-use opendal_core::services::Moka;
+use opendal_service_moka::Moka;
use opendal_core::Operator;
#[tokio::main]
diff --git a/core/core/src/services/moka/mod.rs b/core/services/moka/src/lib.rs
similarity index 85%
rename from core/core/src/services/moka/mod.rs
rename to core/services/moka/src/lib.rs
index 6d5ca4b64..9b9e70215 100644
--- a/core/core/src/services/moka/mod.rs
+++ b/core/services/moka/src/lib.rs
@@ -15,10 +15,9 @@
// specific language governing permissions and limitations
// under the License.
-/// Default scheme for moka service.
-pub const MOKA_SCHEME: &str = "moka";
-
-use crate::types::DEFAULT_OPERATOR_REGISTRY;
+#![cfg_attr(docsrs, feature(doc_cfg))]
+//! Moka service implementation for Apache OpenDAL.
+#![deny(missing_docs)]
mod backend;
mod config;
@@ -32,7 +31,10 @@ pub use backend::MokaCacheBuilder;
pub use config::MokaConfig;
pub use core::MokaValue;
+/// Default scheme for moka service.
+pub const MOKA_SCHEME: &str = "moka";
+
#[ctor::ctor]
fn register_moka_service() {
- DEFAULT_OPERATOR_REGISTRY.register::<Moka>(MOKA_SCHEME);
+ opendal_core::DEFAULT_OPERATOR_REGISTRY.register::<Moka>(MOKA_SCHEME);
}
diff --git a/core/core/src/services/moka/lister.rs
b/core/services/moka/src/lister.rs
similarity index 96%
rename from core/core/src/services/moka/lister.rs
rename to core/services/moka/src/lister.rs
index d6541b03a..4c60e5784 100644
--- a/core/core/src/services/moka/lister.rs
+++ b/core/services/moka/src/lister.rs
@@ -19,9 +19,9 @@ use std::sync::Arc;
use std::vec::IntoIter;
use super::core::MokaCore;
-use crate::raw::oio;
-use crate::raw::*;
-use crate::*;
+use opendal_core::raw::oio;
+use opendal_core::raw::*;
+use opendal_core::*;
pub struct MokaLister {
root: String,
diff --git a/core/core/src/services/moka/writer.rs
b/core/services/moka/src/writer.rs
similarity index 97%
rename from core/core/src/services/moka/writer.rs
rename to core/services/moka/src/writer.rs
index f1bdf09ab..1a88b94b1 100644
--- a/core/core/src/services/moka/writer.rs
+++ b/core/services/moka/src/writer.rs
@@ -18,9 +18,9 @@
use std::sync::Arc;
use super::core::{MokaCore, MokaValue};
-use crate::raw::oio;
-use crate::raw::*;
-use crate::*;
+use opendal_core::raw::oio;
+use opendal_core::raw::*;
+use opendal_core::*;
pub struct MokaWriter {
core: Arc<MokaCore>,
diff --git a/core/src/lib.rs b/core/src/lib.rs
index 4192eb619..8349138de 100644
--- a/core/src/lib.rs
+++ b/core/src/lib.rs
@@ -27,6 +27,8 @@ pub use opendal_core::*;
/// Re-export of service implementations.
pub mod services {
pub use opendal_core::services::*;
+ #[cfg(feature = "services-moka")]
+ pub use opendal_service_moka::*;
#[cfg(feature = "services-s3")]
pub use opendal_service_s3::*;
}
