Drop-OSS/dropbreak
1
0
Fork 0
mirror of https://github.com/Drop-OSS/dropbreak.git synced 2026-07-21 00:05:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

Allow boxed backends

Browse Source
This commit is contained in:
Marcel Müller
2020-07-01 13:37:39 +02:00
parent 456ab9041d
commit 910e0f35fe
2 changed files with 67 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/backend/mod.rs
+35
View File
@@ -25,6 +25,30 @@ pub trait Backend {
fn put_data(&mut self, data: &[u8]) -> error::Result<()>;
}
impl Backend for Box<dyn Backend> {
fn get_data(&mut self) -> error::Result<Vec<u8>> {
use std::ops::DerefMut;
self.deref_mut().get_data()
}
fn put_data(&mut self, data: &[u8]) -> error::Result<()> {
use std::ops::DerefMut;
self.deref_mut().put_data(data)
}
}
impl<T: Backend> Backend for Box<T> {
fn get_data(&mut self) -> error::Result<Vec<u8>> {
use std::ops::DerefMut;
self.deref_mut().get_data()
}
fn put_data(&mut self, data: &[u8]) -> error::Result<()> {
use std::ops::DerefMut;
self.deref_mut().put_data(data)
}
}
#[cfg(feature = "mmap")]
mod mmap;
#[cfg(feature = "mmap")]
@@ -94,10 +118,12 @@ impl MemoryBackend {
impl Backend for MemoryBackend {
fn get_data(&mut self) -> error::Result<Vec<u8>> {
println!("Returning data: {:?}", &self.0);
Ok(self.0.clone())
}
fn put_data(&mut self, data: &[u8]) -> error::Result<()> {
println!("Writing data: {:?}", data);
self.0 = data.to_owned();
Ok(())
}
@@ -126,4 +152,13 @@ mod tests {
backend.put_data(&data).unwrap();
assert_eq!(backend.get_data().unwrap(), data);
}
#[test]
fn allow_boxed_backends() {
let mut backend = Box::new(MemoryBackend::new());
let data = [4, 5, 1, 6, 8, 1];
backend.put_data(&data).unwrap();
assert_eq!(backend.get_data().unwrap(), data);
}
}
src/lib.rs
+32 -19
View File
@@ -231,9 +231,9 @@ pub struct Database<Data, Back, DeSer>
impl<Data, Back, DeSer> Database<Data, Back, DeSer>
where
Data: Serialize + DeserializeOwned + Debug + Clone + Send,
Back: Backend + Debug,
DeSer: DeSerializer<Data> + Debug + Send + Sync + Clone
Data: Serialize + DeserializeOwned + Clone + Send,
Back: Backend,
DeSer: DeSerializer<Data> + Send + Sync + Clone
{
/// Write lock the database and get write access to the `Data` container
///
@@ -375,7 +375,7 @@ impl<Data, Back, DeSer> Database<Data, Back, DeSer>
Ok(())
}
/// Read lock the database and get write access to the `Data` container
/// Read lock the database and get read access to the `Data` container
///
/// This gives you a read-only lock on the database. You can have as many readers in parallel
/// as you wish.
@@ -541,15 +541,15 @@ impl<Data, Back, DeSer> Database<Data, Back, DeSer>
pub fn put_data(&self, new_data: Data, save: bool) -> error::Result<()> {
let mut backend = self.backend.lock().map_err(|_| error::RustbreakErrorKind::Poison)?;
let mut data = self.data.write().map_err(|_| error::RustbreakErrorKind::Poison)?;
*data = new_data;
if save {
// TODO: Spin this into its own method
let ser = self.deser.serialize(&*data)
let ser = self.deser.serialize(&data)
.context(error::RustbreakErrorKind::Serialization)?;
backend.put_data(&ser).context(error::RustbreakErrorKind::Backend)?;
drop(backend);
}
*data = new_data;
Ok(())
}
@@ -628,8 +628,8 @@ pub type FileDatabase<D, DS> = Database<D, FileBackend, DS>;
impl<Data, DeSer> Database<Data, FileBackend, DeSer>
where
Data: Serialize + DeserializeOwned + Debug + Clone + Send,
DeSer: DeSerializer<Data> + Debug + Send + Sync + Clone
Data: Serialize + DeserializeOwned + Clone + Send,
DeSer: DeSerializer<Data> + Send + Sync + Clone
{
/// Create new FileDatabase from Path
pub fn from_path<S>(path: S, data: Data)
@@ -663,8 +663,8 @@ pub type PathDatabase<D, DS> = Database<D, PathBackend, DS>;
impl<Data, DeSer> Database<Data, PathBackend, DeSer>
where
Data: Serialize + DeserializeOwned + Debug + Clone + Send,
DeSer: DeSerializer<Data> + Debug + Send + Sync + Clone
Data: Serialize + DeserializeOwned + Clone + Send,
DeSer: DeSerializer<Data> + Send + Sync + Clone
{
/// Create new [`PathDatabase`] from a [`Path`](std::path::Path).
pub fn from_path<S>(path: S, data: Data)
@@ -689,8 +689,8 @@ pub type MemoryDatabase<D, DS> = Database<D, MemoryBackend, DS>;
impl<Data, DeSer> Database<Data, MemoryBackend, DeSer>
where
Data: Serialize + DeserializeOwned + Debug + Clone + Send,
DeSer: DeSerializer<Data> + Debug + Send + Sync + Clone
Data: Serialize + DeserializeOwned + Clone + Send,
DeSer: DeSerializer<Data> + Send + Sync + Clone
{
/// Create new FileDatabase from Path
pub fn memory(data: Data) -> error::Result<MemoryDatabase<Data, DeSer>> {
@@ -711,8 +711,8 @@ pub type MmapDatabase<D, DS> = Database<D, MmapStorage, DS>;
#[cfg(feature = "mmap")]
impl<Data, DeSer> Database<Data, MmapStorage, DeSer>
where
Data: Serialize + DeserializeOwned + Debug + Clone + Send,
DeSer: DeSerializer<Data> + Debug + Send + Sync + Clone
Data: Serialize + DeserializeOwned + Clone + Send,
DeSer: DeSerializer<Data> + Send + Sync + Clone
{
/// Create new MmapDatabase.
pub fn mmap(data: Data) -> error::Result<MmapDatabase<Data, DeSer>> {
@@ -766,9 +766,9 @@ impl<Data, Back, DeSer> Database<Data, Back, DeSer> {
impl<Data, Back, DeSer> Database<Data, Back, DeSer>
where
Data: Serialize + DeserializeOwned + Debug + Clone + Send,
Back: Backend + Debug,
DeSer: DeSerializer<Data> + Debug + Send + Sync + Clone
Data: Serialize + DeserializeOwned + Clone + Send,
Back: Backend,
DeSer: DeSerializer<Data> + Send + Sync + Clone
{
/// Converts from one data type to another
///
@@ -776,9 +776,9 @@ impl<Data, Back, DeSer> Database<Data, Back, DeSer>
pub fn convert_data<C, OutputData>(self, convert: C)
-> error::Result<Database<OutputData, Back, DeSer>>
where
OutputData: Serialize + DeserializeOwned + Debug + Clone + Send,
OutputData: Serialize + DeserializeOwned + Clone + Send,
C: FnOnce(Data) -> OutputData,
DeSer: DeSerializer<OutputData> + Debug + Send + Sync,
DeSer: DeSerializer<OutputData> + Send + Sync,
{
let (data, backend, deser) = self.into_inner()?;
Ok(Database {
@@ -788,3 +788,16 @@ impl<Data, Back, DeSer> Database<Data, Back, DeSer>
})
}
}
#[cfg(test)]
mod tests {
use super::{Database, Backend, MemoryBackend, MemoryDatabase, deser::Ron};
#[test]
fn allow_databases_with_boxed_backend() {
let db = MemoryDatabase::<Vec<u64>, Ron>::memory(vec![]).expect("To be created");
let db: Database<_, Box<dyn Backend>, _>= db.with_backend(Box::new(MemoryBackend::new()));
db.put_data(vec![1, 2, 3], true).expect("Can save data in memory");
assert_eq!(&[1, 2, 3], &db.get_data(true).expect("Can get data from memory")[..]);
}
}