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 28656c35b refactor: Split mini-moka service to new crate (#7020)
28656c35b is described below
commit 28656c35b84e3d55e406bf2aaeb2af72af36c599
Author: Qinxuan Chen <[email protected]>
AuthorDate: Tue Dec 16 15:48:47 2025 +0800
refactor: Split mini-moka service to new crate (#7020)
---
core/Cargo.lock | 13 +++++++-
core/Cargo.toml | 3 +-
core/core/Cargo.toml | 3 --
core/core/src/services/mod.rs | 5 ---
core/services/mini_moka/Cargo.toml | 38 ++++++++++++++++++++++
.../mini_moka/src}/backend.rs | 4 +--
.../mini_moka => services/mini_moka/src}/config.rs | 17 +++++-----
.../mini_moka => services/mini_moka/src}/core.rs | 3 +-
.../mini_moka/src}/deleter.rs | 6 ++--
.../mini_moka => services/mini_moka/src}/docs.md | 0
.../mod.rs => services/mini_moka/src/lib.rs} | 11 ++++---
.../mini_moka => services/mini_moka/src}/lister.rs | 6 ++--
.../mini_moka => services/mini_moka/src}/writer.rs | 9 ++---
core/src/lib.rs | 2 ++
14 files changed, 84 insertions(+), 36 deletions(-)
diff --git a/core/Cargo.lock b/core/Cargo.lock
index bfbf62c4f..2dcfe098b 100644
--- a/core/Cargo.lock
+++ b/core/Cargo.lock
@@ -5564,6 +5564,7 @@ dependencies = [
"opendal-service-ghac",
"opendal-service-hdfs-native",
"opendal-service-ipfs",
+ "opendal-service-mini-moka",
"opendal-service-moka",
"opendal-service-mysql",
"opendal-service-obs",
@@ -5646,7 +5647,6 @@ dependencies = [
"log",
"md-5",
"mea",
- "mini-moka",
"moka",
"mongodb",
"mongodb-internal-macros",
@@ -6080,6 +6080,17 @@ dependencies = [
"tokio",
]
+[[package]]
+name = "opendal-service-mini-moka"
+version = "0.55.0"
+dependencies = [
+ "ctor",
+ "log",
+ "mini-moka",
+ "opendal-core",
+ "serde",
+]
+
[[package]]
name = "opendal-service-moka"
version = "0.55.0"
diff --git a/core/Cargo.toml b/core/Cargo.toml
index bd6f82364..05a44d9eb 100644
--- a/core/Cargo.toml
+++ b/core/Cargo.toml
@@ -133,7 +133,7 @@ services-koofr = ["opendal-core/services-koofr"]
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-mini-moka = ["dep:opendal-service-mini-moka"]
services-moka = ["dep:opendal-service-moka"]
services-mongodb = ["opendal-core/services-mongodb"]
services-monoiofs = ["opendal-core/services-monoiofs"]
@@ -215,6 +215,7 @@ opendal-service-gcs = { path = "services/gcs", version =
"0.55.0", optional = tr
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-ipfs = { path = "services/ipfs", version = "0.55.0", optional
= true, default-features = false }
+opendal-service-mini-moka = { path = "services/mini_moka", version = "0.55.0",
optional = true, default-features = false }
opendal-service-moka = { path = "services/moka", version = "0.55.0", optional
= true, default-features = false }
opendal-service-mysql = { path = "services/mysql", version = "0.55.0",
optional = true, default-features = false }
opendal-service-obs = { path = "services/obs", version = "0.55.0", optional =
true, default-features = false }
diff --git a/core/core/Cargo.toml b/core/core/Cargo.toml
index 63094190f..c732d3c20 100644
--- a/core/core/Cargo.toml
+++ b/core/core/Cargo.toml
@@ -96,7 +96,6 @@ services-koofr = []
services-lakefs = []
services-memcached = ["dep:fastpool"]
services-memory = []
-services-mini-moka = ["dep:mini-moka"]
services-mongodb = ["dep:mongodb", "dep:mongodb-internal-macros"]
services-monoiofs = ["dep:monoio", "dep:flume"]
services-onedrive = []
@@ -190,8 +189,6 @@ foundationdb = { version = "0.9.0", features = [
hdrs = { version = "0.3.2", optional = true, features = ["async_file"] }
# for services-upyun
hmac = { version = "0.12.1", optional = true }
-# for services-mini-moka
-mini-moka = { version = "0.10", optional = true }
# for services-moka
moka = { version = "0.12", optional = true, features = ["future", "sync"] }
# for services-mongodb
diff --git a/core/core/src/services/mod.rs b/core/core/src/services/mod.rs
index b9687cc05..96b3ddc52 100644
--- a/core/core/src/services/mod.rs
+++ b/core/core/src/services/mod.rs
@@ -119,11 +119,6 @@ mod memory;
#[cfg(feature = "services-memory")]
pub use self::memory::*;
-#[cfg(feature = "services-mini-moka")]
-mod mini_moka;
-#[cfg(feature = "services-mini-moka")]
-pub use self::mini_moka::*;
-
#[cfg(feature = "services-mongodb")]
mod mongodb;
#[cfg(feature = "services-mongodb")]
diff --git a/core/services/mini_moka/Cargo.toml
b/core/services/mini_moka/Cargo.toml
new file mode 100644
index 000000000..24483bdb4
--- /dev/null
+++ b/core/services/mini_moka/Cargo.toml
@@ -0,0 +1,38 @@
+# 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 mini-moka service implementation"
+name = "opendal-service-mini-moka"
+
+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]
+ctor = { workspace = true }
+log = { workspace = true }
+mini-moka = "0.10"
+opendal-core = { path = "../../core", version = "0.55.0", default-features =
false }
+serde = { workspace = true, features = ["derive"] }
diff --git a/core/core/src/services/mini_moka/backend.rs
b/core/services/mini_moka/src/backend.rs
similarity index 99%
rename from core/core/src/services/mini_moka/backend.rs
rename to core/services/mini_moka/src/backend.rs
index 55da226cb..dcad3c875 100644
--- a/core/core/src/services/mini_moka/backend.rs
+++ b/core/services/mini_moka/src/backend.rs
@@ -18,6 +18,8 @@
use std::sync::Arc;
use log::debug;
+use opendal_core::raw::*;
+use opendal_core::*;
use super::MINI_MOKA_SCHEME;
use super::config::MiniMokaConfig;
@@ -25,8 +27,6 @@ use super::core::*;
use super::deleter::MiniMokaDeleter;
use super::lister::MiniMokaLister;
use super::writer::MiniMokaWriter;
-use crate::raw::*;
-use crate::*;
/// [mini-moka](https://github.com/moka-rs/mini-moka) backend support.
#[doc = include_str!("docs.md")]
diff --git a/core/core/src/services/mini_moka/config.rs
b/core/services/mini_moka/src/config.rs
similarity index 88%
rename from core/core/src/services/mini_moka/config.rs
rename to core/services/mini_moka/src/config.rs
index 8106858f2..9138c4189 100644
--- a/core/core/src/services/mini_moka/config.rs
+++ b/core/services/mini_moka/src/config.rs
@@ -15,6 +15,9 @@
// specific language governing permissions and limitations
// under the License.
+use opendal_core::Configurator;
+use opendal_core::OperatorUri;
+use opendal_core::Result;
use serde::Deserialize;
use serde::Serialize;
@@ -42,10 +45,10 @@ pub struct MiniMokaConfig {
pub root: Option<String>,
}
-impl crate::Configurator for MiniMokaConfig {
+impl Configurator for MiniMokaConfig {
type Builder = MiniMokaBuilder;
- 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(root) = uri.root() {
@@ -65,19 +68,17 @@ impl crate::Configurator for MiniMokaConfig {
#[cfg(test)]
mod tests {
use super::*;
- use crate::Configurator;
- use crate::types::OperatorUri;
#[test]
- fn from_uri_sets_root_and_preserves_ttl() {
+ fn from_uri_sets_root_and_preserves_ttl() -> Result<()> {
let uri = OperatorUri::new(
"mini-moka:///session",
vec![("time_to_live".to_string(), "300s".to_string())],
- )
- .unwrap();
+ )?;
- let cfg = MiniMokaConfig::from_uri(&uri).unwrap();
+ let cfg = MiniMokaConfig::from_uri(&uri)?;
assert_eq!(cfg.root.as_deref(), Some("session"));
assert!(cfg.time_to_live.is_some());
+ Ok(())
}
}
diff --git a/core/core/src/services/mini_moka/core.rs
b/core/services/mini_moka/src/core.rs
similarity index 98%
rename from core/core/src/services/mini_moka/core.rs
rename to core/services/mini_moka/src/core.rs
index 9b95463a1..81ee773fe 100644
--- a/core/core/src/services/mini_moka/core.rs
+++ b/core/services/mini_moka/src/core.rs
@@ -18,8 +18,7 @@
use std::fmt::Debug;
use mini_moka::sync::Cache;
-
-use crate::*;
+use opendal_core::*;
/// Value stored in mini-moka cache containing both metadata and content
#[derive(Clone)]
diff --git a/core/core/src/services/mini_moka/deleter.rs
b/core/services/mini_moka/src/deleter.rs
similarity index 95%
rename from core/core/src/services/mini_moka/deleter.rs
rename to core/services/mini_moka/src/deleter.rs
index 9f3950cfc..c21e1529f 100644
--- a/core/core/src/services/mini_moka/deleter.rs
+++ b/core/services/mini_moka/src/deleter.rs
@@ -17,10 +17,10 @@
use std::sync::Arc;
+use opendal_core::raw::*;
+use opendal_core::*;
+
use super::core::MiniMokaCore;
-use crate::raw::oio;
-use crate::raw::*;
-use crate::*;
pub struct MiniMokaDeleter {
core: Arc<MiniMokaCore>,
diff --git a/core/core/src/services/mini_moka/docs.md
b/core/services/mini_moka/src/docs.md
similarity index 100%
rename from core/core/src/services/mini_moka/docs.md
rename to core/services/mini_moka/src/docs.md
diff --git a/core/core/src/services/mini_moka/mod.rs
b/core/services/mini_moka/src/lib.rs
similarity index 84%
rename from core/core/src/services/mini_moka/mod.rs
rename to core/services/mini_moka/src/lib.rs
index 1df625522..322009c2f 100644
--- a/core/core/src/services/mini_moka/mod.rs
+++ b/core/services/mini_moka/src/lib.rs
@@ -15,10 +15,10 @@
// specific language governing permissions and limitations
// under the License.
-/// Default scheme for mini-moka service.
-pub const MINI_MOKA_SCHEME: &str = "mini-moka";
+//! Mini-moka service implementation for Apache OpenDAL.
-use crate::types::DEFAULT_OPERATOR_REGISTRY;
+#![cfg_attr(docsrs, feature(doc_cfg))]
+#![deny(missing_docs)]
mod backend;
mod config;
@@ -30,7 +30,10 @@ mod writer;
pub use backend::MiniMokaBuilder as MiniMoka;
pub use config::MiniMokaConfig;
+/// Default scheme for mini-moka service.
+pub const MINI_MOKA_SCHEME: &str = "mini-moka";
+
#[ctor::ctor]
fn register_minimoka_service() {
- DEFAULT_OPERATOR_REGISTRY.register::<MiniMoka>(MINI_MOKA_SCHEME);
+
opendal_core::DEFAULT_OPERATOR_REGISTRY.register::<MiniMoka>(MINI_MOKA_SCHEME);
}
diff --git a/core/core/src/services/mini_moka/lister.rs
b/core/services/mini_moka/src/lister.rs
similarity index 97%
rename from core/core/src/services/mini_moka/lister.rs
rename to core/services/mini_moka/src/lister.rs
index 735b38002..d608d8b22 100644
--- a/core/core/src/services/mini_moka/lister.rs
+++ b/core/services/mini_moka/src/lister.rs
@@ -18,10 +18,10 @@
use std::sync::Arc;
use std::vec::IntoIter;
+use opendal_core::raw::*;
+use opendal_core::*;
+
use super::core::MiniMokaCore;
-use crate::raw::oio;
-use crate::raw::*;
-use crate::*;
pub struct MiniMokaLister {
root: String,
diff --git a/core/core/src/services/mini_moka/writer.rs
b/core/services/mini_moka/src/writer.rs
similarity index 95%
rename from core/core/src/services/mini_moka/writer.rs
rename to core/services/mini_moka/src/writer.rs
index aafdacfec..84fec5ccb 100644
--- a/core/core/src/services/mini_moka/writer.rs
+++ b/core/services/mini_moka/src/writer.rs
@@ -15,12 +15,13 @@
// specific language governing permissions and limitations
// under the License.
-use super::core::{MiniMokaCore, MiniMokaValue};
-use crate::raw::oio;
-use crate::raw::*;
-use crate::*;
use std::sync::Arc;
+use opendal_core::raw::*;
+use opendal_core::*;
+
+use super::core::*;
+
pub struct MiniMokaWriter {
core: Arc<MiniMokaCore>,
path: String,
diff --git a/core/src/lib.rs b/core/src/lib.rs
index 23a879bc3..59f2196e3 100644
--- a/core/src/lib.rs
+++ b/core/src/lib.rs
@@ -53,6 +53,8 @@ pub mod services {
pub use opendal_service_hdfs_native::*;
#[cfg(feature = "services-ipfs")]
pub use opendal_service_ipfs::*;
+ #[cfg(feature = "services-mini-moka")]
+ pub use opendal_service_mini_moka::*;
#[cfg(feature = "services-moka")]
pub use opendal_service_moka::*;
#[cfg(feature = "services-mysql")]
