You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@opendal.apache.org by ko...@apache.org on 2025/12/16 04:18:03 UTC
(opendal) 01/01: refactor: Split mini-moka service to new crate
This is an automated email from the ASF dual-hosted git repository.
koushiro pushed a commit to branch extract-mini-moka-service
in repository https://gitbox.apache.org/repos/asf/opendal.git
commit 20afc75e47096129c52dea02d96526d0d441e4c2
Author: koushiro <ko...@gmail.com>
AuthorDate: Tue Dec 16 12:17:48 2025 +0800
refactor: Split mini-moka service to new crate
---
core/Cargo.lock | 13 ++++++++++++-
core/Cargo.toml | 5 +++--
core/core/Cargo.toml | 3 ---
core/core/src/services/mod.rs | 5 -----
core/services/{sqlite => mini_moka}/Cargo.toml | 15 +++++----------
.../mini_moka => services/mini_moka/src}/backend.rs | 4 ++--
.../mini_moka => services/mini_moka/src}/config.rs | 8 ++++----
.../services/mini_moka => services/mini_moka/src}/core.rs | 3 +--
.../mini_moka => services/mini_moka/src}/deleter.rs | 6 +++---
.../services/mini_moka => services/mini_moka/src}/docs.md | 0
.../mini_moka/mod.rs => services/mini_moka/src/lib.rs} | 12 ++++++++----
.../mini_moka => services/mini_moka/src}/lister.rs | 6 +++---
.../mini_moka => services/mini_moka/src}/writer.rs | 9 +++++----
core/services/sqlite/Cargo.toml | 1 -
core/src/lib.rs | 2 ++
15 files changed, 48 insertions(+), 44 deletions(-)
diff --git a/core/Cargo.lock b/core/Cargo.lock
index fcc412432..2c92a038b 100644
--- a/core/Cargo.lock
+++ b/core/Cargo.lock
@@ -5563,6 +5563,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",
@@ -5645,7 +5646,6 @@ dependencies = [
"log",
"md-5",
"mea",
- "mini-moka",
"moka",
"mongodb",
"mongodb-internal-macros",
@@ -6064,6 +6064,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 e28afa65c..cda5b4e36 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"]
@@ -214,14 +214,15 @@ 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 }
opendal-service-oss = { path = "services/oss", version = "0.55.0", optional = true, default-features = false }
opendal-service-postgresql = { path = "services/postgresql", 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-sqlite = { path = "services/sqlite", 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-sqlite = { path = "services/sqlite", 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 }
diff --git a/core/core/Cargo.toml b/core/core/Cargo.toml
index 855ed1a41..ba7ab9980 100644
--- a/core/core/Cargo.toml
+++ b/core/core/Cargo.toml
@@ -97,7 +97,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 = []
@@ -191,8 +190,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 2f211a4f5..33d9ed771 100644
--- a/core/core/src/services/mod.rs
+++ b/core/core/src/services/mod.rs
@@ -124,11 +124,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/sqlite/Cargo.toml b/core/services/mini_moka/Cargo.toml
similarity index 81%
copy from core/services/sqlite/Cargo.toml
copy to core/services/mini_moka/Cargo.toml
index 5afc1e0a1..0c7645c27 100644
--- a/core/services/sqlite/Cargo.toml
+++ b/core/services/mini_moka/Cargo.toml
@@ -16,8 +16,8 @@
# under the License.
[package]
-description = "Apache OpenDAL SQLite service implementation"
-name = "opendal-service-sqlite"
+description = "Apache OpenDAL mini-moka service implementation"
+name = "opendal-service-mini-moka"
authors = { workspace = true }
edition = { workspace = true }
@@ -31,13 +31,8 @@ version = { workspace = true }
all-features = true
[dependencies]
-opendal-core = { path = "../../core", version = "0.55.0", default-features = false }
-
ctor = { workspace = true }
-mea = { version = "0.5.1" }
+log = { workspace = true }
+mini-moka = { version = "0.10" }
+opendal-core = { path = "../../core", version = "0.55.0", default-features = false }
serde = { workspace = true, features = ["derive"] }
-sqlx = { version = "0.8.0", features = ["runtime-tokio-rustls", "sqlite"] }
-
-[dev-dependencies]
-tokio = { workspace = true, features = ["macros", "rt-multi-thread"] }
-
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 93%
rename from core/core/src/services/mini_moka/config.rs
rename to core/services/mini_moka/src/config.rs
index 8106858f2..3b1eb01a9 100644
--- a/core/core/src/services/mini_moka/config.rs
+++ b/core/services/mini_moka/src/config.rs
@@ -15,6 +15,8 @@
// specific language governing permissions and limitations
// under the License.
+use opendal_core::Configurator;
+use opendal_core::OperatorUri;
use serde::Deserialize;
use serde::Serialize;
@@ -42,10 +44,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) -> opendal_core::Result<Self> {
let mut map = uri.options().clone();
if let Some(root) = uri.root() {
@@ -65,8 +67,6 @@ 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() {
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 82%
rename from core/core/src/services/mini_moka/mod.rs
rename to core/services/mini_moka/src/lib.rs
index 1df625522..0182c4985 100644
--- a/core/core/src/services/mini_moka/mod.rs
+++ b/core/services/mini_moka/src/lib.rs
@@ -15,10 +15,11 @@
// 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)]
+#![deny(unused_crate_dependencies)]
mod backend;
mod config;
@@ -30,7 +31,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 97%
rename from core/core/src/services/mini_moka/writer.rs
rename to core/services/mini_moka/src/writer.rs
index aafdacfec..0b7766450 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::{MiniMokaCore, MiniMokaValue};
+
pub struct MiniMokaWriter {
core: Arc<MiniMokaCore>,
path: String,
diff --git a/core/services/sqlite/Cargo.toml b/core/services/sqlite/Cargo.toml
index 5afc1e0a1..00867279c 100644
--- a/core/services/sqlite/Cargo.toml
+++ b/core/services/sqlite/Cargo.toml
@@ -40,4 +40,3 @@ sqlx = { version = "0.8.0", features = ["runtime-tokio-rustls", "sqlite"] }
[dev-dependencies]
tokio = { workspace = true, features = ["macros", "rt-multi-thread"] }
-
diff --git a/core/src/lib.rs b/core/src/lib.rs
index 100f746b1..5f7bf23db 100644
--- a/core/src/lib.rs
+++ b/core/src/lib.rs
@@ -51,6 +51,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")]