dissolve key_value/*

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

src/service/rooms/state/data.rs

@@ -3,7 +3,7 @@ use std::{collections::HashSet, sync::Arc};
 use ruma::{EventId, OwnedEventId, RoomId};
 use tokio::sync::MutexGuard;
 
-use crate::Result;
+use crate::{utils, Error, KeyValueDatabase, Result};
 
 pub trait Data: Send + Sync {
 	/// Returns the last state hash key added to the db for the given room.
@@ -31,3 +31,70 @@ pub trait Data: Send + Sync {
 		_mutex_lock: &MutexGuard<'_, ()>, // Take mutex guard to make sure users get the room state mutex
 	) -> Result<()>;
 }
+
+impl Data for KeyValueDatabase {
+	fn get_room_shortstatehash(&self, room_id: &RoomId) -> Result<Option<u64>> {
+		self.roomid_shortstatehash
+			.get(room_id.as_bytes())?
+			.map_or(Ok(None), |bytes| {
+				Ok(Some(utils::u64_from_bytes(&bytes).map_err(|_| {
+					Error::bad_database("Invalid shortstatehash in roomid_shortstatehash")
+				})?))
+			})
+	}
+
+	fn set_room_state(
+		&self,
+		room_id: &RoomId,
+		new_shortstatehash: u64,
+		_mutex_lock: &MutexGuard<'_, ()>, // Take mutex guard to make sure users get the room state mutex
+	) -> Result<()> {
+		self.roomid_shortstatehash
+			.insert(room_id.as_bytes(), &new_shortstatehash.to_be_bytes())?;
+		Ok(())
+	}
+
+	fn set_event_state(&self, shorteventid: u64, shortstatehash: u64) -> Result<()> {
+		self.shorteventid_shortstatehash
+			.insert(&shorteventid.to_be_bytes(), &shortstatehash.to_be_bytes())?;
+		Ok(())
+	}
+
+	fn get_forward_extremities(&self, room_id: &RoomId) -> Result<HashSet<Arc<EventId>>> {
+		let mut prefix = room_id.as_bytes().to_vec();
+		prefix.push(0xFF);
+
+		self.roomid_pduleaves
+			.scan_prefix(prefix)
+			.map(|(_, bytes)| {
+				EventId::parse_arc(
+					utils::string_from_bytes(&bytes)
+						.map_err(|_| Error::bad_database("EventID in roomid_pduleaves is invalid unicode."))?,
+				)
+				.map_err(|_| Error::bad_database("EventId in roomid_pduleaves is invalid."))
+			})
+			.collect()
+	}
+
+	fn set_forward_extremities(
+		&self,
+		room_id: &RoomId,
+		event_ids: Vec<OwnedEventId>,
+		_mutex_lock: &MutexGuard<'_, ()>, // Take mutex guard to make sure users get the room state mutex
+	) -> Result<()> {
+		let mut prefix = room_id.as_bytes().to_vec();
+		prefix.push(0xFF);
+
+		for (key, _) in self.roomid_pduleaves.scan_prefix(prefix.clone()) {
+			self.roomid_pduleaves.remove(&key)?;
+		}
+
+		for event_id in event_ids {
+			let mut key = prefix.clone();
+			key.extend_from_slice(event_id.as_bytes());
+			self.roomid_pduleaves.insert(&key, event_id.as_bytes())?;
+		}
+
+		Ok(())
+	}
+}

src/service/rooms/state/mod.rs

@@ -4,7 +4,7 @@ use std::{
 	sync::Arc,
 };
 
-pub use data::Data;
+use data::Data;
 use ruma::{
 	api::client::error::ErrorKind,
 	events::{