This is an automated email from the ASF dual-hosted git repository. koushiro pushed a commit to branch rocksdb in repository https://gitbox.apache.org/repos/asf/opendal.git
commit cec19571d5780658c520ca2ce497ab3b5ae0371d Author: koushiro <[email protected]> AuthorDate: Mon Dec 22 16:57:52 2025 +0800 revert some changes --- core/services/rocksdb/src/backend.rs | 31 ++++++++++++++----------------- core/services/rocksdb/src/deleter.rs | 6 ++++-- core/services/rocksdb/src/lister.rs | 4 ++-- core/services/rocksdb/src/writer.rs | 5 +++-- 4 files changed, 23 insertions(+), 23 deletions(-) diff --git a/core/services/rocksdb/src/backend.rs b/core/services/rocksdb/src/backend.rs index 4c70102e3..c3a27e2b6 100644 --- a/core/services/rocksdb/src/backend.rs +++ b/core/services/rocksdb/src/backend.rs @@ -17,22 +17,22 @@ use std::sync::Arc; -use rocksdb::DB; - -use crate::ROCKSDB_SCHEME; -use crate::config::RocksdbConfig; -use crate::core::*; -use crate::deleter::RocksdbDeleter; -use crate::lister::RocksdbLister; -use crate::writer::RocksdbWriter; use opendal_core::raw::*; use opendal_core::*; +use rocksdb::DB; + +use super::ROCKSDB_SCHEME; +use super::config::RocksdbConfig; +use super::core::*; +use super::deleter::RocksdbDeleter; +use super::lister::RocksdbLister; +use super::writer::RocksdbWriter; /// RocksDB service support. #[doc = include_str!("docs.md")] #[derive(Debug, Default)] pub struct RocksdbBuilder { - pub(crate) config: RocksdbConfig, + pub(super) config: RocksdbConfig, } impl RocksdbBuilder { @@ -61,16 +61,13 @@ impl Builder for RocksdbBuilder { fn build(self) -> Result<impl Access> { let path = self.config.datadir.ok_or_else(|| { - Error::new( - ErrorKind::ConfigInvalid, - "datadir is not specified for rocksdb service", - ) - .with_context("service", ROCKSDB_SCHEME) + Error::new(ErrorKind::ConfigInvalid, "datadir is required but not set") + .with_context("service", ROCKSDB_SCHEME) })?; let db = DB::open_default(&path).map_err(|e| { - Error::new(ErrorKind::Unexpected, "failed to open rocksdb instance") + Error::new(ErrorKind::ConfigInvalid, "open default transaction db") .with_context("service", ROCKSDB_SCHEME) - .with_context("datadir", path.clone()) + .with_context("datadir", path) .set_source(e) })?; @@ -80,7 +77,7 @@ impl Builder for RocksdbBuilder { } } -/// Backend for rocksdb service +/// Backend for rocksdb service. #[derive(Clone, Debug)] pub struct RocksdbBackend { core: Arc<RocksdbCore>, diff --git a/core/services/rocksdb/src/deleter.rs b/core/services/rocksdb/src/deleter.rs index f7495f71e..a6f14b9b7 100644 --- a/core/services/rocksdb/src/deleter.rs +++ b/core/services/rocksdb/src/deleter.rs @@ -15,10 +15,12 @@ // specific language governing permissions and limitations // under the License. -use crate::core::RocksdbCore; +use std::sync::Arc; + use opendal_core::raw::*; use opendal_core::*; -use std::sync::Arc; + +use super::core::RocksdbCore; pub struct RocksdbDeleter { core: Arc<RocksdbCore>, diff --git a/core/services/rocksdb/src/lister.rs b/core/services/rocksdb/src/lister.rs index 60a1f7590..b39548cec 100644 --- a/core/services/rocksdb/src/lister.rs +++ b/core/services/rocksdb/src/lister.rs @@ -18,11 +18,11 @@ use std::sync::Arc; use std::vec::IntoIter; -use crate::core::*; -use opendal_core::raw::oio; use opendal_core::raw::*; use opendal_core::*; +use super::core::*; + pub struct RocksdbLister { root: String, iter: IntoIter<String>, diff --git a/core/services/rocksdb/src/writer.rs b/core/services/rocksdb/src/writer.rs index 8c90ae7ef..58699e8ed 100644 --- a/core/services/rocksdb/src/writer.rs +++ b/core/services/rocksdb/src/writer.rs @@ -17,10 +17,11 @@ use std::sync::Arc; -use crate::core::*; -use opendal_core::raw::oio; +use opendal_core::raw::*; use opendal_core::*; +use super::core::*; + pub struct RocksdbWriter { core: Arc<RocksdbCore>, path: String,
