refactor state accessor, state cache, user, uiaa

src/database/key_value/rooms/state_accessor.rs

@@ -1,7 +1,5 @@
-    /// Builds a StateMap by iterating over all keys that start
-    /// with state_hash, this gives the full state for the given state_hash.
-    #[tracing::instrument(skip(self))]
-    pub async fn state_full_ids(&self, shortstatehash: u64) -> Result<BTreeMap<u64, Arc<EventId>>> {
+impl service::room::state_accessor::Data for KeyValueDatabase {
+    async fn state_full_ids(&self, shortstatehash: u64) -> Result<BTreeMap<u64, Arc<EventId>>> {
         let full_state = self
             .load_shortstatehash_info(shortstatehash)?
             .pop()
@@ -21,8 +19,7 @@
         Ok(result)
     }
 
-    #[tracing::instrument(skip(self))]
-    pub async fn state_full(
+    async fn state_full(
         &self,
         shortstatehash: u64,
     ) -> Result<HashMap<(StateEventType, String), Arc<PduEvent>>> {
@@ -59,8 +56,7 @@
     }
 
     /// Returns a single PDU from `room_id` with key (`event_type`, `state_key`).
-    #[tracing::instrument(skip(self))]
-    pub fn state_get_id(
+    fn state_get_id(
         &self,
         shortstatehash: u64,
         event_type: &StateEventType,
@@ -86,8 +82,7 @@
     }
 
     /// Returns a single PDU from `room_id` with key (`event_type`, `state_key`).
-    #[tracing::instrument(skip(self))]
-    pub fn state_get(
+    fn state_get(
         &self,
         shortstatehash: u64,
         event_type: &StateEventType,
@@ -98,7 +93,7 @@
     }
 
     /// Returns the state hash for this pdu.
-    pub fn pdu_shortstatehash(&self, event_id: &EventId) -> Result<Option<u64>> {
+    fn pdu_shortstatehash(&self, event_id: &EventId) -> Result<Option<u64>> {
         self.eventid_shorteventid
             .get(event_id.as_bytes())?
             .map_or(Ok(None), |shorteventid| {
@@ -116,8 +111,7 @@
     }
 
     /// Returns the full room state.
-    #[tracing::instrument(skip(self))]
-    pub async fn room_state_full(
+    async fn room_state_full(
         &self,
         room_id: &RoomId,
     ) -> Result<HashMap<(StateEventType, String), Arc<PduEvent>>> {
@@ -129,8 +123,7 @@
     }
 
     /// Returns a single PDU from `room_id` with key (`event_type`, `state_key`).
-    #[tracing::instrument(skip(self))]
-    pub fn room_state_get_id(
+    fn room_state_get_id(
         &self,
         room_id: &RoomId,
         event_type: &StateEventType,
@@ -144,8 +137,7 @@
     }
 
     /// Returns a single PDU from `room_id` with key (`event_type`, `state_key`).
-    #[tracing::instrument(skip(self))]
-    pub fn room_state_get(
+    fn room_state_get(
         &self,
         room_id: &RoomId,
         event_type: &StateEventType,
@@ -157,4 +149,3 @@
             Ok(None)
         }
     }
-

src/database/key_value/rooms/state_cache.rs

@@ -0,0 +1,8 @@
+impl service::room::state_cache::Data for KeyValueDatabase {
+    fn mark_as_once_joined(user_id: &UserId, room_id: &RoomId) -> Result<()> {
+        let mut userroom_id = user_id.as_bytes().to_vec();
+        userroom_id.push(0xff);
+        userroom_id.extend_from_slice(room_id.as_bytes());
+        self.roomuseroncejoinedids.insert(&userroom_id, &[])?;
+    }
+}

src/database/key_value/rooms/user.rs

@@ -1,6 +1,5 @@
-
-    #[tracing::instrument(skip(self))]
-    pub fn reset_notification_counts(&self, user_id: &UserId, room_id: &RoomId) -> Result<()> {
+impl service::room::user::Data for KeyValueDatabase {
+    fn reset_notification_counts(&self, user_id: &UserId, room_id: &RoomId) -> Result<()> {
         let mut userroom_id = user_id.as_bytes().to_vec();
         userroom_id.push(0xff);
         userroom_id.extend_from_slice(room_id.as_bytes());
@@ -13,8 +12,7 @@
         Ok(())
     }
 
-    #[tracing::instrument(skip(self))]
-    pub fn notification_count(&self, user_id: &UserId, room_id: &RoomId) -> Result<u64> {
+    fn notification_count(&self, user_id: &UserId, room_id: &RoomId) -> Result<u64> {
         let mut userroom_id = user_id.as_bytes().to_vec();
         userroom_id.push(0xff);
         userroom_id.extend_from_slice(room_id.as_bytes());
@@ -28,8 +26,7 @@
             .unwrap_or(Ok(0))
     }
 
-    #[tracing::instrument(skip(self))]
-    pub fn highlight_count(&self, user_id: &UserId, room_id: &RoomId) -> Result<u64> {
+    fn highlight_count(&self, user_id: &UserId, room_id: &RoomId) -> Result<u64> {
         let mut userroom_id = user_id.as_bytes().to_vec();
         userroom_id.push(0xff);
         userroom_id.extend_from_slice(room_id.as_bytes());
@@ -43,7 +40,7 @@
             .unwrap_or(Ok(0))
     }
 
-    pub fn associate_token_shortstatehash(
+    fn associate_token_shortstatehash(
         &self,
         room_id: &RoomId,
         token: u64,
@@ -58,7 +55,7 @@
             .insert(&key, &shortstatehash.to_be_bytes())
     }
 
-    pub fn get_token_shortstatehash(&self, room_id: &RoomId, token: u64) -> Result<Option<u64>> {
+    fn get_token_shortstatehash(&self, room_id: &RoomId, token: u64) -> Result<Option<u64>> {
         let shortroomid = self.get_shortroomid(room_id)?.expect("room exists");
 
         let mut key = shortroomid.to_be_bytes().to_vec();
@@ -74,8 +71,7 @@
             .transpose()
     }
 
-    #[tracing::instrument(skip(self))]
-    pub fn get_shared_rooms<'a>(
+    fn get_shared_rooms<'a>(
         &'a self,
         users: Vec<Box<UserId>>,
     ) -> Result<impl Iterator<Item = Result<Box<RoomId>>> + 'a> {
@@ -111,4 +107,4 @@
                 .map_err(|_| Error::bad_database("Invalid RoomId in userroomid_joined."))
             }))
     }
-
+}