From 8639b60aadd3bd939fb981e4c69a110855646a94 Mon Sep 17 00:00:00 2001 From: Ziyang Hu Date: Sun, 15 May 2022 23:23:43 +0800 Subject: [PATCH] format --- cozorocks/bridge/cozorocks.h | 12 ++++------ cozorocks/src/bridge.rs | 34 ++++++++++++---------------- cozorocks/src/lib.rs | 44 +++++++++++------------------------- cozorocks/src/options.rs | 1 - cozorocks/src/status.rs | 3 +-- src/db.rs | 3 +-- src/lib.rs | 2 +- 7 files changed, 35 insertions(+), 64 deletions(-) diff --git a/cozorocks/bridge/cozorocks.h b/cozorocks/bridge/cozorocks.h index f17b4318..7142acf4 100644 --- a/cozorocks/bridge/cozorocks.h +++ b/cozorocks/bridge/cozorocks.h @@ -513,9 +513,7 @@ open_tdb_raw(const Options &options, std::vector handles; TransactionDB *txn_db = nullptr; - Status s = TransactionDB::Open(options, txn_db_options, path, &txn_db); - auto ok = s.ok(); - write_status(std::move(s), status); + write_status(TransactionDB::Open(options, txn_db_options, path, &txn_db), status); return make_shared(txn_db, txn_db, nullptr); } @@ -525,11 +523,9 @@ inline shared_ptr open_odb_raw(const Options &options, const string &path, BridgeStatus &status) { OptimisticTransactionDB *txn_db = nullptr; - Status s = OptimisticTransactionDB::Open(options, - path, - &txn_db); - auto ok = s.ok(); - write_status(std::move(s), status); + write_status(OptimisticTransactionDB::Open(options, + path, + &txn_db), status); unordered_map> handle_map; diff --git a/cozorocks/src/bridge.rs b/cozorocks/src/bridge.rs index c1f66384..36aeee40 100644 --- a/cozorocks/src/bridge.rs +++ b/cozorocks/src/bridge.rs @@ -144,7 +144,10 @@ mod ffi { type TransactionBridge; fn set_snapshot(self: &TransactionBridge); - fn set_readoption_snapshot_to_current(self: &TransactionBridge, opts: Pin<&mut ReadOptions>) -> bool; + fn set_readoption_snapshot_to_current( + self: &TransactionBridge, + opts: Pin<&mut ReadOptions>, + ) -> bool; fn commit(self: &TransactionBridge, status: &mut BridgeStatus); fn rollback(self: &TransactionBridge, status: &mut BridgeStatus); fn set_savepoint(self: &TransactionBridge); @@ -171,12 +174,7 @@ mod ffi { slice: Pin<&mut PinnableSlice>, status: &mut BridgeStatus, ); - fn put_txn( - self: &TransactionBridge, - key: &[u8], - val: &[u8], - status: &mut BridgeStatus, - ); + fn put_txn(self: &TransactionBridge, key: &[u8], val: &[u8], status: &mut BridgeStatus); fn put_raw( self: &TransactionBridge, options: &WriteOptions, @@ -184,11 +182,7 @@ mod ffi { val: &[u8], status: &mut BridgeStatus, ); - fn del_txn( - self: &TransactionBridge, - key: &[u8], - status: &mut BridgeStatus, - ); + fn del_txn(self: &TransactionBridge, key: &[u8], status: &mut BridgeStatus); fn del_raw( self: &TransactionBridge, options: &WriteOptions, @@ -202,14 +196,16 @@ mod ffi { end_key: &[u8], status: &mut BridgeStatus, ); - fn flush_raw( - self: &TransactionBridge, - options: &FlushOptions, - status: &mut BridgeStatus, - ); + fn flush_raw(self: &TransactionBridge, options: &FlushOptions, status: &mut BridgeStatus); fn compact_all_raw(self: &TransactionBridge, status: &mut BridgeStatus); - fn iterator_txn(self: &TransactionBridge, r_opts: &ReadOptions) -> UniquePtr; - fn iterator_raw(self: &TransactionBridge, r_opts: &ReadOptions) -> UniquePtr; + fn iterator_txn( + self: &TransactionBridge, + r_opts: &ReadOptions, + ) -> UniquePtr; + fn iterator_raw( + self: &TransactionBridge, + r_opts: &ReadOptions, + ) -> UniquePtr; type TDBBridge; fn begin_t_transaction( diff --git a/cozorocks/src/lib.rs b/cozorocks/src/lib.rs index e8cd5ecf..7b0e3764 100644 --- a/cozorocks/src/lib.rs +++ b/cozorocks/src/lib.rs @@ -1,6 +1,6 @@ mod bridge; -mod status; mod options; +mod status; use bridge::*; pub use options::*; @@ -14,12 +14,8 @@ pub use bridge::StatusSeverity; pub use bridge::StatusSubCode; use cxx::let_cxx_string; pub use cxx::{SharedPtr, UniquePtr}; -use std::fmt::Debug; -use std::fmt::{Display, Formatter}; -use std::marker::PhantomData; -use std::ops::{Deref, DerefMut}; use status::Result; - +use std::ops::Deref; pub struct PinnableSlicePtr(UniquePtr); @@ -191,16 +187,16 @@ impl TransactionPtr { ) -> Result { let mut status = BridgeStatus::default(); let res = if transact { - let ret = self.get_txn(options, key.as_ref(), slice.0.pin_mut(), &mut status); + self.get_txn(options, key.as_ref(), slice.0.pin_mut(), &mut status); status.check_err(()) } else { - let ret = self.get_raw(options, key.as_ref(), slice.0.pin_mut(), &mut status); + self.get_raw(options, key.as_ref(), slice.0.pin_mut(), &mut status); status.check_err(()) }; match res { - Ok(r) => Ok(true), + Ok(_) => Ok(true), Err(e) if e.status.code == StatusCode::kNotFound => Ok(false), - Err(e) => Err(e) + Err(e) => Err(e), } } #[inline] @@ -211,20 +207,15 @@ impl TransactionPtr { slice: &mut PinnableSlicePtr, ) -> Result { let mut status = BridgeStatus::default(); - let ret = self.get_for_update_txn(options, key.as_ref(), slice.0.pin_mut(), &mut status); + self.get_for_update_txn(options, key.as_ref(), slice.0.pin_mut(), &mut status); match status.check_err(()) { - Ok(r) => Ok(true), + Ok(_) => Ok(true), Err(e) if e.status.code == StatusCode::kNotFound => Ok(false), - Err(e) => Err(e) + Err(e) => Err(e), } } #[inline] - pub fn del( - &self, - options: &WriteOptions, - transact: bool, - key: impl AsRef<[u8]>, - ) -> Result<()> { + pub fn del(&self, options: &WriteOptions, transact: bool, key: impl AsRef<[u8]>) -> Result<()> { let mut status = BridgeStatus::default(); if transact { let ret = self.del_txn(key.as_ref(), &mut status); @@ -275,10 +266,7 @@ impl TransactionPtr { } } #[inline] - pub fn iterator(&self, - options: &ReadOptions, - transact: bool, - ) -> IteratorPtr { + pub fn iterator(&self, options: &ReadOptions, transact: bool) -> IteratorPtr { if transact { IteratorPtr(self.iterator_txn(options)) } else { @@ -324,14 +312,8 @@ impl DBPtr { write_ops: WriteOptionsPtr, ) -> TransactionPtr { TransactionPtr(match options { - TransactOptions::Optimistic(o) => self.begin_o_transaction( - write_ops.0, - o.0, - ), - TransactOptions::Pessimistic(o) => self.begin_t_transaction( - write_ops.0, - o.0, - ), + TransactOptions::Optimistic(o) => self.begin_o_transaction(write_ops.0, o.0), + TransactOptions::Pessimistic(o) => self.begin_t_transaction(write_ops.0, o.0), }) } } diff --git a/cozorocks/src/options.rs b/cozorocks/src/options.rs index 28ed085a..fe084f22 100644 --- a/cozorocks/src/options.rs +++ b/cozorocks/src/options.rs @@ -2,7 +2,6 @@ use crate::bridge::*; use cxx::UniquePtr; use std::ops::{Deref, DerefMut}; - pub struct RustComparatorPtr(UniquePtr); impl RustComparatorPtr { diff --git a/cozorocks/src/status.rs b/cozorocks/src/status.rs index 61e69934..746cda09 100644 --- a/cozorocks/src/status.rs +++ b/cozorocks/src/status.rs @@ -1,7 +1,6 @@ +use crate::bridge::{BridgeStatus, StatusBridgeCode, StatusCode, StatusSeverity, StatusSubCode}; use std::fmt::Debug; use std::fmt::{Display, Formatter}; -use crate::bridge::{BridgeStatus, StatusCode, StatusSubCode, StatusSeverity, StatusBridgeCode}; - pub(crate) type Result = std::result::Result; diff --git a/src/db.rs b/src/db.rs index bdc94034..c1e993cc 100644 --- a/src/db.rs +++ b/src/db.rs @@ -9,8 +9,7 @@ // pub mod query; // pub mod table; - pub struct DBInstance { pub(crate) main_db: (), session_handles: (), -} \ No newline at end of file +} diff --git a/src/lib.rs b/src/lib.rs index 30f96621..61c9916b 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -3,6 +3,6 @@ // pub mod relation; // pub(crate) mod eval; pub(crate) mod data; +pub(crate) mod db; pub(crate) mod logger; pub(crate) mod parser; -pub(crate) mod db;