Database Refactor

combine service/users data w/ mod unit

split sliding sync related out of service/users

instrument database entry points

remove increment crap from database interface

de-wrap all database get() calls

de-wrap all database insert() calls

de-wrap all database remove() calls

refactor database interface for async streaming

add query key serializer for database

implement Debug for result handle

add query deserializer for database

add deserialization trait for option handle

start a stream utils suite

de-wrap/asyncify/type-query count_one_time_keys()

de-wrap/asyncify users count

add admin query users command suite

de-wrap/asyncify users exists

de-wrap/partially asyncify user filter related

asyncify/de-wrap users device/keys related

asyncify/de-wrap user auth/misc related

asyncify/de-wrap users blurhash

asyncify/de-wrap account_data get; merge Data into Service

partial asyncify/de-wrap uiaa; merge Data into Service

partially asyncify/de-wrap transaction_ids get; merge Data into Service

partially asyncify/de-wrap key_backups; merge Data into Service

asyncify/de-wrap pusher service getters; merge Data into Service

asyncify/de-wrap rooms alias getters/some iterators

asyncify/de-wrap rooms directory getters/iterator

partially asyncify/de-wrap rooms lazy-loading

partially asyncify/de-wrap rooms metadata

asyncify/dewrap rooms outlier

asyncify/dewrap rooms pdu_metadata

dewrap/partially asyncify rooms read receipt

de-wrap rooms search service

de-wrap/partially asyncify rooms user service

partial de-wrap rooms state_compressor

de-wrap rooms state_cache

de-wrap room state et al

de-wrap rooms timeline service

additional users device/keys related

de-wrap/asyncify sender

asyncify services

refactor database to TryFuture/TryStream

refactor services for TryFuture/TryStream

asyncify api handlers

additional asyncification for admin module

abstract stream related; support reverse streams

additional stream conversions

asyncify state-res related

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

src/service/rooms/metadata/mod.rs

@@ -1,51 +1,92 @@
-mod data;
-
 use std::sync::Arc;
 
-use conduit::Result;
-use ruma::{OwnedRoomId, RoomId};
+use conduit::{implement, utils::stream::TryIgnore, Result};
+use database::Map;
+use futures::{Stream, StreamExt};
+use ruma::RoomId;
 
-use self::data::Data;
+use crate::{rooms, Dep};
 
 pub struct Service {
 	db: Data,
+	services: Services,
+}
+
+struct Data {
+	disabledroomids: Arc<Map>,
+	bannedroomids: Arc<Map>,
+	roomid_shortroomid: Arc<Map>,
+	pduid_pdu: Arc<Map>,
+}
+
+struct Services {
+	short: Dep<rooms::short::Service>,
 }
 
 impl crate::Service for Service {
 	fn build(args: crate::Args<'_>) -> Result<Arc<Self>> {
 		Ok(Arc::new(Self {
-			db: Data::new(&args),
+			db: Data {
+				disabledroomids: args.db["disabledroomids"].clone(),
+				bannedroomids: args.db["bannedroomids"].clone(),
+				roomid_shortroomid: args.db["roomid_shortroomid"].clone(),
+				pduid_pdu: args.db["pduid_pdu"].clone(),
+			},
+			services: Services {
+				short: args.depend::<rooms::short::Service>("rooms::short"),
+			},
 		}))
 	}
 
 	fn name(&self) -> &str { crate::service::make_name(std::module_path!()) }
 }
 
-impl Service {
-	/// Checks if a room exists.
-	#[inline]
-	pub fn exists(&self, room_id: &RoomId) -> Result<bool> { self.db.exists(room_id) }
+#[implement(Service)]
+pub async fn exists(&self, room_id: &RoomId) -> bool {
+	let Ok(prefix) = self.services.short.get_shortroomid(room_id).await else {
+		return false;
+	};
 
-	#[must_use]
-	pub fn iter_ids<'a>(&'a self) -> Box<dyn Iterator<Item = Result<OwnedRoomId>> + 'a> { self.db.iter_ids() }
+	// Look for PDUs in that room.
+	self.db
+		.pduid_pdu
+		.keys_raw_prefix(&prefix)
+		.ignore_err()
+		.next()
+		.await
+		.is_some()
+}
 
-	#[inline]
-	pub fn is_disabled(&self, room_id: &RoomId) -> Result<bool> { self.db.is_disabled(room_id) }
+#[implement(Service)]
+pub fn iter_ids(&self) -> impl Stream<Item = &RoomId> + Send + '_ { self.db.roomid_shortroomid.keys().ignore_err() }
 
-	#[inline]
-	pub fn disable_room(&self, room_id: &RoomId, disabled: bool) -> Result<()> {
-		self.db.disable_room(room_id, disabled)
-	}
-
-	#[inline]
-	pub fn is_banned(&self, room_id: &RoomId) -> Result<bool> { self.db.is_banned(room_id) }
-
-	#[inline]
-	pub fn ban_room(&self, room_id: &RoomId, banned: bool) -> Result<()> { self.db.ban_room(room_id, banned) }
-
-	#[inline]
-	#[must_use]
-	pub fn list_banned_rooms<'a>(&'a self) -> Box<dyn Iterator<Item = Result<OwnedRoomId>> + 'a> {
-		self.db.list_banned_rooms()
+#[implement(Service)]
+#[inline]
+pub fn disable_room(&self, room_id: &RoomId, disabled: bool) {
+	if disabled {
+		self.db.disabledroomids.insert(room_id.as_bytes(), &[]);
+	} else {
+		self.db.disabledroomids.remove(room_id.as_bytes());
 	}
 }
+
+#[implement(Service)]
+#[inline]
+pub fn ban_room(&self, room_id: &RoomId, banned: bool) {
+	if banned {
+		self.db.bannedroomids.insert(room_id.as_bytes(), &[]);
+	} else {
+		self.db.bannedroomids.remove(room_id.as_bytes());
+	}
+}
+
+#[implement(Service)]
+pub fn list_banned_rooms(&self) -> impl Stream<Item = &RoomId> + Send + '_ { self.db.bannedroomids.keys().ignore_err() }
+
+#[implement(Service)]
+#[inline]
+pub async fn is_disabled(&self, room_id: &RoomId) -> bool { self.db.disabledroomids.qry(room_id).await.is_ok() }
+
+#[implement(Service)]
+#[inline]
+pub async fn is_banned(&self, room_id: &RoomId) -> bool { self.db.bannedroomids.qry(room_id).await.is_ok() }