dolysis/conduwuit
3
0
Fork 0
mirror of https://github.com/girlbossceo/conduwuit.git synced 2024-11-26 07:34:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix multi_get for abstraction and limit to specific column for least-surprise

Browse source 
Signed-off-by: Jason Volk <jason@zemos.net>
This commit is contained in:
Jason Volk 2024-04-10 11:51:37 -07:00 committed by June
parent c4ebc2f1d1
commit b4080de749
2 changed files with 26 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/database/kvtree.rs
View file

@ -1,4 +1,4 @@
use std::{future::Future, pin::Pin, sync::Arc};
use std::{future::Future, pin::Pin};
use crate::Result;
@ -6,11 +6,13 @@ pub(crate) trait KvTree: Send + Sync {
fn get(&self, key: &[u8]) -> Result<Option<Vec<u8>>>;
#[allow(dead_code)]
#[cfg(feature = "rocksdb")]
fn multi_get(
&self, _iter: Vec<(&Arc<rust_rocksdb::BoundColumnFamily<'_>>, Vec<u8>)>,
) -> Vec<Result<Option<Vec<u8>>, rust_rocksdb::Error>> {
unimplemented!()
fn multi_get(&self, keys: &[&[u8]]) -> Result<Vec<Option<Vec<u8>>>> {
let mut ret: Vec<Option<Vec<u8>>> = Vec::with_capacity(keys.len());
for key in keys {
ret.push(self.get(key)?);
}
Ok(ret)
}
fn insert(&self, key: &[u8], value: &[u8]) -> Result<()>;

22
src/database/rocksdb/kvtree.rs
View file

@ -23,13 +23,27 @@ impl KvTree for RocksDbEngineTree<'_> {
Ok(self.db.rocks.get_cf_opt(&self.cf(), key, &readoptions)?)
}
fn multi_get(
&self, iter: Vec<(&Arc<rust_rocksdb::BoundColumnFamily<'_>>, Vec<u8>)>,
) -> Vec<Result<Option<Vec<u8>>, rust_rocksdb::Error>> {
fn multi_get(&self, keys: &[&[u8]]) -> Result<Vec<Option<Vec<u8>>>> {
let mut readoptions = rust_rocksdb::ReadOptions::default();
readoptions.set_total_order_seek(true);
self.db.rocks.multi_get_cf_opt(iter, &readoptions)
// Optimization can be `true` if key vector is pre-sorted **by the column
// comparator**.
const SORTED: bool = false;
let mut ret: Vec<Option<Vec<u8>>> = Vec::with_capacity(keys.len());
for res in self
.db
.rocks
.batched_multi_get_cf_opt(&self.cf(), keys, SORTED, &readoptions)
{
match res? {
Some(res) => ret.push(Some((*res).to_vec())),
None => ret.push(None),
}
}
Ok(ret)
}
fn insert(&self, key: &[u8], value: &[u8]) -> Result<()> {