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

Signed-off-by: Jason Volk <jason@zemos.net>

src/database/kvtree.rs

@@ -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, keys: &[&[u8]]) -> Result<Vec<Option<Vec<u8>>>> {
-	fn multi_get(
+		let mut ret: Vec<Option<Vec<u8>>> = Vec::with_capacity(keys.len());
-		&self, _iter: Vec<(&Arc<rust_rocksdb::BoundColumnFamily<'_>>, Vec<u8>)>,
+		for key in keys {
-	) -> Vec<Result<Option<Vec<u8>>, rust_rocksdb::Error>> {
+			ret.push(self.get(key)?);
-		unimplemented!()
+		}
+
+		Ok(ret)
 	}
 
 	fn insert(&self, key: &[u8], value: &[u8]) -> Result<()>;

src/database/rocksdb/kvtree.rs

@@ -23,13 +23,27 @@ impl KvTree for RocksDbEngineTree<'_> {
 		Ok(self.db.rocks.get_cf_opt(&self.cf(), key, &readoptions)?)
 	}
 
-	fn multi_get(
+	fn multi_get(&self, keys: &[&[u8]]) -> Result<Vec<Option<Vec<u8>>>> {
-		&self, iter: Vec<(&Arc<rust_rocksdb::BoundColumnFamily<'_>>, Vec<u8>)>,
-	) -> Vec<Result<Option<Vec<u8>>, rust_rocksdb::Error>> {
 		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<()> {