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 661e65bb9 refactor: Split service postgresql to new crate (#6973)
661e65bb9 is described below
commit 661e65bb97e56354e7986cdd75b3e01b595d6377
Author: fenfeng9 <[email protected]>
AuthorDate: Thu Dec 11 18:49:36 2025 +0800
refactor: Split service postgresql to new crate (#6973)
refactor(services/postgresql): split service into standalone crate
---
core/Cargo.lock | 12 +++++++
core/Cargo.toml | 3 +-
core/core/Cargo.toml | 1 -
core/core/src/services/mod.rs | 5 ---
core/services/postgresql/Cargo.toml | 39 ++++++++++++++++++++++
.../postgresql/src}/backend.rs | 4 +--
.../postgresql/src}/config.rs | 8 ++---
.../postgresql => services/postgresql/src}/core.rs | 2 +-
.../postgresql/src}/deleter.rs | 6 ++--
.../postgresql => services/postgresql/src}/docs.md | 2 +-
.../mod.rs => services/postgresql/src/lib.rs} | 2 +-
.../postgresql/src}/writer.rs | 4 +--
core/src/lib.rs | 2 ++
13 files changed, 69 insertions(+), 21 deletions(-)
diff --git a/core/Cargo.lock b/core/Cargo.lock
index d8b928875..46b16d2eb 100644
--- a/core/Cargo.lock
+++ b/core/Cargo.lock
@@ -5503,6 +5503,7 @@ dependencies = [
"opendal-service-hdfs-native",
"opendal-service-moka",
"opendal-service-mysql",
+ "opendal-service-postgresql",
"opendal-service-s3",
"opendal-service-vercel-blob",
"opentelemetry",
@@ -5915,6 +5916,17 @@ dependencies = [
"sqlx",
]
+[[package]]
+name = "opendal-service-postgresql"
+version = "0.55.0"
+dependencies = [
+ "ctor",
+ "mea",
+ "opendal-core",
+ "serde",
+ "sqlx",
+]
+
[[package]]
name = "opendal-service-s3"
version = "0.55.0"
diff --git a/core/Cargo.toml b/core/Cargo.toml
index b39ba8aaf..76a8b4a04 100644
--- a/core/Cargo.toml
+++ b/core/Cargo.toml
@@ -147,7 +147,7 @@ services-opfs = ["opendal-core/services-opfs"]
services-oss = ["opendal-core/services-oss"]
services-pcloud = ["opendal-core/services-pcloud"]
services-persy = ["opendal-core/services-persy"]
-services-postgresql = ["opendal-core/services-postgresql"]
+services-postgresql = ["dep:opendal-service-postgresql"]
services-redb = ["opendal-core/services-redb"]
services-redis = ["opendal-core/services-redis"]
services-redis-native-tls = ["opendal-core/services-redis-native-tls"]
@@ -210,6 +210,7 @@ opendal-service-ghac = { path = "services/ghac", version =
"0.55.0", optional =
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 }
opendal-service-mysql = { path = "services/mysql", 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-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 d17af9395..53bab3070 100644
--- a/core/core/Cargo.toml
+++ b/core/core/Cargo.toml
@@ -139,7 +139,6 @@ services-oss = [
]
services-pcloud = []
services-persy = ["dep:persy", "internal-tokio-rt"]
-services-postgresql = ["dep:sqlx", "sqlx?/postgres"]
services-redb = ["dep:redb", "internal-tokio-rt"]
services-redis = ["dep:redis", "dep:fastpool", "redis?/tokio-rustls-comp"]
services-redis-native-tls = ["services-redis", "redis?/tokio-native-tls-comp"]
diff --git a/core/core/src/services/mod.rs b/core/core/src/services/mod.rs
index 55f38c22c..acd629b4b 100644
--- a/core/core/src/services/mod.rs
+++ b/core/core/src/services/mod.rs
@@ -194,11 +194,6 @@ mod persy;
#[cfg(feature = "services-persy")]
pub use self::persy::*;
-#[cfg(feature = "services-postgresql")]
-mod postgresql;
-#[cfg(feature = "services-postgresql")]
-pub use self::postgresql::*;
-
#[cfg(feature = "services-redb")]
mod redb;
#[cfg(feature = "services-redb")]
diff --git a/core/services/postgresql/Cargo.toml
b/core/services/postgresql/Cargo.toml
new file mode 100644
index 000000000..926aaeef3
--- /dev/null
+++ b/core/services/postgresql/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 PostgreSQL service implementation"
+name = "opendal-service-postgresql"
+
+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"] }
+sqlx = { version = "0.8.0", features = ["runtime-tokio-rustls", "postgres"] }
diff --git a/core/core/src/services/postgresql/backend.rs
b/core/services/postgresql/src/backend.rs
similarity index 99%
rename from core/core/src/services/postgresql/backend.rs
rename to core/services/postgresql/src/backend.rs
index 338f70b6d..f92dd90f5 100644
--- a/core/core/src/services/postgresql/backend.rs
+++ b/core/services/postgresql/src/backend.rs
@@ -25,8 +25,8 @@ use super::config::PostgresqlConfig;
use super::core::*;
use super::deleter::PostgresqlDeleter;
use super::writer::PostgresqlWriter;
-use crate::raw::*;
-use crate::*;
+use opendal_core::raw::*;
+use opendal_core::*;
/// [PostgreSQL](https://www.postgresql.org/) services support.
#[doc = include_str!("docs.md")]
diff --git a/core/core/src/services/postgresql/config.rs
b/core/services/postgresql/src/config.rs
similarity index 95%
rename from core/core/src/services/postgresql/config.rs
rename to core/services/postgresql/src/config.rs
index bfa86e1c0..e35fad3b8 100644
--- a/core/core/src/services/postgresql/config.rs
+++ b/core/services/postgresql/src/config.rs
@@ -61,10 +61,10 @@ impl Debug for PostgresqlConfig {
}
}
-impl crate::Configurator for PostgresqlConfig {
+impl opendal_core::Configurator for PostgresqlConfig {
type Builder = PostgresqlBuilder;
- fn from_uri(uri: &crate::types::OperatorUri) -> crate::Result<Self> {
+ fn from_uri(uri: &opendal_core::OperatorUri) -> opendal_core::Result<Self>
{
let mut map = uri.options().clone();
if let Some(authority) = uri.authority() {
@@ -103,8 +103,8 @@ impl crate::Configurator for PostgresqlConfig {
#[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_connection_string_table_and_root() {
diff --git a/core/core/src/services/postgresql/core.rs
b/core/services/postgresql/src/core.rs
similarity index 99%
rename from core/core/src/services/postgresql/core.rs
rename to core/services/postgresql/src/core.rs
index 309fac33a..9733b4479 100644
--- a/core/core/src/services/postgresql/core.rs
+++ b/core/services/postgresql/src/core.rs
@@ -19,7 +19,7 @@ use mea::once::OnceCell;
use sqlx::PgPool;
use sqlx::postgres::PgConnectOptions;
-use crate::*;
+use opendal_core::*;
#[derive(Clone, Debug)]
pub struct PostgresqlCore {
diff --git a/core/core/src/services/postgresql/deleter.rs
b/core/services/postgresql/src/deleter.rs
similarity index 94%
rename from core/core/src/services/postgresql/deleter.rs
rename to core/services/postgresql/src/deleter.rs
index 68acf06ba..0f5a0c3b2 100644
--- a/core/core/src/services/postgresql/deleter.rs
+++ b/core/services/postgresql/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 PostgresqlDeleter {
core: Arc<PostgresqlCore>,
diff --git a/core/core/src/services/postgresql/docs.md
b/core/services/postgresql/src/docs.md
similarity index 96%
rename from core/core/src/services/postgresql/docs.md
rename to core/services/postgresql/src/docs.md
index 309f6b5de..9a43a0436 100644
--- a/core/core/src/services/postgresql/docs.md
+++ b/core/services/postgresql/src/docs.md
@@ -26,7 +26,7 @@ This service can be used to:
```rust,no_run
use anyhow::Result;
-use opendal_core::services::Postgresql;
+use opendal_service_postgresql::Postgresql;
use opendal_core::Operator;
#[tokio::main]
diff --git a/core/core/src/services/postgresql/mod.rs
b/core/services/postgresql/src/lib.rs
similarity index 96%
rename from core/core/src/services/postgresql/mod.rs
rename to core/services/postgresql/src/lib.rs
index 25863aee0..0d2d27635 100644
--- a/core/core/src/services/postgresql/mod.rs
+++ b/core/services/postgresql/src/lib.rs
@@ -18,7 +18,7 @@
/// Default scheme for postgresql service.
pub const POSTGRESQL_SCHEME: &str = "postgresql";
-use crate::types::DEFAULT_OPERATOR_REGISTRY;
+use opendal_core::DEFAULT_OPERATOR_REGISTRY;
mod backend;
mod config;
diff --git a/core/core/src/services/postgresql/writer.rs
b/core/services/postgresql/src/writer.rs
similarity index 97%
rename from core/core/src/services/postgresql/writer.rs
rename to core/services/postgresql/src/writer.rs
index 38ced921c..3a3e8ed0e 100644
--- a/core/core/src/services/postgresql/writer.rs
+++ b/core/services/postgresql/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 PostgresqlWriter {
core: Arc<PostgresqlCore>,
diff --git a/core/src/lib.rs b/core/src/lib.rs
index 454dedfbb..080e141ac 100644
--- a/core/src/lib.rs
+++ b/core/src/lib.rs
@@ -43,6 +43,8 @@ pub mod services {
pub use opendal_service_moka::*;
#[cfg(feature = "services-mysql")]
pub use opendal_service_mysql::*;
+ #[cfg(feature = "services-postgresql")]
+ pub use opendal_service_postgresql::*;
#[cfg(feature = "services-s3")]
pub use opendal_service_s3::*;
#[cfg(feature = "services-vercel-blob")]
