Commit 89e6db9b authored by Benjamin Woodruff's avatar Benjamin Woodruff

Remove stupid TurboValueBuffer wrapper type

parent fe742f15
...@@ -58,6 +58,12 @@ impl Borrow<[u8]> for ArcBytes { ...@@ -58,6 +58,12 @@ impl Borrow<[u8]> for ArcBytes {
} }
} }
impl AsRef<[u8]> for ArcBytes {
fn as_ref(&self) -> &[u8] {
self
}
}
impl Hash for ArcBytes { impl Hash for ArcBytes {
fn hash<H: Hasher>(&self, state: &mut H) { fn hash<H: Hasher>(&self, state: &mut H) {
self.deref().hash(state) self.deref().hash(state)
......
...@@ -40,14 +40,6 @@ const COMPACT_CONFIG: CompactConfig = CompactConfig { ...@@ -40,14 +40,6 @@ const COMPACT_CONFIG: CompactConfig = CompactConfig {
max_merge_segment_count: 16, max_merge_segment_count: 16,
}; };
pub struct TurboValueBuffer(ArcBytes);
impl AsRef<[u8]> for TurboValueBuffer {
fn as_ref(&self) -> &[u8] {
&self.0
}
}
pub struct TurboKeyValueDatabase { pub struct TurboKeyValueDatabase {
db: Arc<TurboPersistence<TurboTasksParallelScheduler, FAMILIES>>, db: Arc<TurboPersistence<TurboTasksParallelScheduler, FAMILIES>>,
compact_join_handle: Mutex<Option<JoinHandle<Result<()>>>>, compact_join_handle: Mutex<Option<JoinHandle<Result<()>>>>,
...@@ -83,12 +75,12 @@ impl KeyValueDatabase for TurboKeyValueDatabase { ...@@ -83,12 +75,12 @@ impl KeyValueDatabase for TurboKeyValueDatabase {
} }
type ValueBuffer<'l> type ValueBuffer<'l>
= TurboValueBuffer = ArcBytes
where where
Self: 'l; Self: 'l;
fn get<'l>(&'l self, key_space: KeySpace, key: &[u8]) -> Result<Option<Self::ValueBuffer<'l>>> { fn get<'l>(&'l self, key_space: KeySpace, key: &[u8]) -> Result<Option<Self::ValueBuffer<'l>>> {
Ok(self.db.get(key_space as usize, &key)?.map(TurboValueBuffer)) self.db.get(key_space as usize, &key)
} }
fn batch_get<'l>( fn batch_get<'l>(
...@@ -96,12 +88,7 @@ impl KeyValueDatabase for TurboKeyValueDatabase { ...@@ -96,12 +88,7 @@ impl KeyValueDatabase for TurboKeyValueDatabase {
key_space: KeySpace, key_space: KeySpace,
keys: &[&[u8]], keys: &[&[u8]],
) -> Result<Vec<Option<Self::ValueBuffer<'l>>>> { ) -> Result<Vec<Option<Self::ValueBuffer<'l>>>> {
Ok(self self.db.batch_get(key_space as usize, keys)
.db
.batch_get(key_space as usize, keys)?
.into_iter()
.map(|value| value.map(TurboValueBuffer))
.collect())
} }
fn get_multiple<'l>( fn get_multiple<'l>(
...@@ -109,12 +96,7 @@ impl KeyValueDatabase for TurboKeyValueDatabase { ...@@ -109,12 +96,7 @@ impl KeyValueDatabase for TurboKeyValueDatabase {
key_space: KeySpace, key_space: KeySpace,
key: &[u8], key: &[u8],
) -> Result<SmallVec<[Self::ValueBuffer<'l>; 1]>> { ) -> Result<SmallVec<[Self::ValueBuffer<'l>; 1]>> {
Ok(self self.db.get_multiple(key_space as usize, &key)
.db
.get_multiple(key_space as usize, &key)?
.into_iter()
.map(TurboValueBuffer)
.collect())
} }
type ConcurrentWriteBatch<'l> type ConcurrentWriteBatch<'l>
...@@ -214,7 +196,7 @@ pub struct TurboWriteBatch<'a> { ...@@ -214,7 +196,7 @@ pub struct TurboWriteBatch<'a> {
impl<'a> BaseWriteBatch<'a> for TurboWriteBatch<'a> { impl<'a> BaseWriteBatch<'a> for TurboWriteBatch<'a> {
type ValueBuffer<'l> type ValueBuffer<'l>
= TurboValueBuffer = ArcBytes
where where
Self: 'l, Self: 'l,
'a: 'l; 'a: 'l;
...@@ -223,7 +205,7 @@ impl<'a> BaseWriteBatch<'a> for TurboWriteBatch<'a> { ...@@ -223,7 +205,7 @@ impl<'a> BaseWriteBatch<'a> for TurboWriteBatch<'a> {
where where
'a: 'l, 'a: 'l,
{ {
Ok(self.db.get(key_space as usize, &key)?.map(TurboValueBuffer)) self.db.get(key_space as usize, &key)
} }
fn commit(self) -> Result<()> { fn commit(self) -> Result<()> {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment