devirtualize service Data traits

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

src/service/rooms/state_compressor/data.rs

@@ -1,21 +1,28 @@
 use std::{collections::HashSet, mem::size_of, sync::Arc};
 
+use database::KvTree;
+
 use super::CompressedStateEvent;
 use crate::{utils, Error, KeyValueDatabase, Result};
 
-pub struct StateDiff {
-	pub parent: Option<u64>,
-	pub added: Arc<HashSet<CompressedStateEvent>>,
-	pub removed: Arc<HashSet<CompressedStateEvent>>,
+pub(super) struct StateDiff {
+	pub(super) parent: Option<u64>,
+	pub(super) added: Arc<HashSet<CompressedStateEvent>>,
+	pub(super) removed: Arc<HashSet<CompressedStateEvent>>,
 }
 
-pub trait Data: Send + Sync {
-	fn get_statediff(&self, shortstatehash: u64) -> Result<StateDiff>;
-	fn save_statediff(&self, shortstatehash: u64, diff: StateDiff) -> Result<()>;
+pub struct Data {
+	shortstatehash_statediff: Arc<dyn KvTree>,
 }
 
-impl Data for KeyValueDatabase {
-	fn get_statediff(&self, shortstatehash: u64) -> Result<StateDiff> {
+impl Data {
+	pub(super) fn new(db: &Arc<KeyValueDatabase>) -> Self {
+		Self {
+			shortstatehash_statediff: db.shortstatehash_statediff.clone(),
+		}
+	}
+
+	pub(super) fn get_statediff(&self, shortstatehash: u64) -> Result<StateDiff> {
 		let value = self
 			.shortstatehash_statediff
 			.get(&shortstatehash.to_be_bytes())?
@@ -53,7 +60,7 @@ impl Data for KeyValueDatabase {
 		})
 	}
 
-	fn save_statediff(&self, shortstatehash: u64, diff: StateDiff) -> Result<()> {
+	pub(super) fn save_statediff(&self, shortstatehash: u64, diff: StateDiff) -> Result<()> {
 		let mut value = diff.parent.unwrap_or(0).to_be_bytes().to_vec();
 		for new in diff.added.iter() {
 			value.extend_from_slice(&new[..]);

src/service/rooms/state_compressor/mod.rs

@@ -1,3 +1,8 @@
+use std::sync::Mutex as StdMutex;
+
+use conduit::Server;
+use database::KeyValueDatabase;
+
 mod data;
 use std::{
 	collections::HashSet,
@@ -41,16 +46,25 @@ type ParentStatesVec = Vec<(
 )>;
 
 type HashSetCompressStateEvent = Result<(u64, Arc<HashSet<CompressedStateEvent>>, Arc<HashSet<CompressedStateEvent>>)>;
+pub type CompressedStateEvent = [u8; 2 * size_of::<u64>()];
 
 pub struct Service {
-	pub db: Arc<dyn Data>,
+	pub db: Data,
 
 	pub stateinfo_cache: StateInfoLruCache,
 }
 
-pub type CompressedStateEvent = [u8; 2 * size_of::<u64>()];
-
 impl Service {
+	pub fn build(server: &Arc<Server>, db: &Arc<KeyValueDatabase>) -> Result<Self> {
+		let config = &server.config;
+		Ok(Self {
+			db: Data::new(db),
+			stateinfo_cache: StdMutex::new(LruCache::new(
+				(f64::from(config.stateinfo_cache_capacity) * config.conduit_cache_capacity_modifier) as usize,
+			)),
+		})
+	}
+
 	/// Returns a stack with info on shortstatehash, full state, added diff and
 	/// removed diff for the selected shortstatehash and each parent layer.
 	#[tracing::instrument(skip(self))]