From 814b9e28b68dbe6af91d3a397f6a631f1f4e9113 Mon Sep 17 00:00:00 2001 From: Jason Volk Date: Wed, 9 Oct 2024 03:37:13 +0000 Subject: [PATCH] fix unnecessary re-serializations Signed-off-by: Jason Volk --- src/database/map/rev_stream_from.rs | 3 +-- src/database/map/stream_from.rs | 3 +-- src/service/rooms/metadata/mod.rs | 4 ++-- src/service/rooms/pdu_metadata/data.rs | 2 +- src/service/rooms/short/mod.rs | 2 +- src/service/rooms/state_cache/mod.rs | 4 ++-- src/service/updates/mod.rs | 2 +- 7 files changed, 9 insertions(+), 11 deletions(-) diff --git a/src/database/map/rev_stream_from.rs b/src/database/map/rev_stream_from.rs index 650cf038..c48f406b 100644 --- a/src/database/map/rev_stream_from.rs +++ b/src/database/map/rev_stream_from.rs @@ -18,8 +18,7 @@ where K: Deserialize<'a> + Send, V: Deserialize<'a> + Send, { - let key = ser::serialize_to_vec(from).expect("failed to serialize query key"); - self.rev_stream_raw_from(&key) + self.rev_stream_raw_from(from) .map(keyval::result_deserialize::) } diff --git a/src/database/map/stream_from.rs b/src/database/map/stream_from.rs index 153d5bb6..db828125 100644 --- a/src/database/map/stream_from.rs +++ b/src/database/map/stream_from.rs @@ -18,8 +18,7 @@ where K: Deserialize<'a> + Send, V: Deserialize<'a> + Send, { - let key = ser::serialize_to_vec(from).expect("failed to serialize query key"); - self.stream_raw_from(&key) + self.stream_raw_from(from) .map(keyval::result_deserialize::) } diff --git a/src/service/rooms/metadata/mod.rs b/src/service/rooms/metadata/mod.rs index 5d4a47c7..d8be6aab 100644 --- a/src/service/rooms/metadata/mod.rs +++ b/src/service/rooms/metadata/mod.rs @@ -85,8 +85,8 @@ pub fn list_banned_rooms(&self) -> impl Stream + Send + '_ { sel #[implement(Service)] #[inline] -pub async fn is_disabled(&self, room_id: &RoomId) -> bool { self.db.disabledroomids.qry(room_id).await.is_ok() } +pub async fn is_disabled(&self, room_id: &RoomId) -> bool { self.db.disabledroomids.get(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() } +pub async fn is_banned(&self, room_id: &RoomId) -> bool { self.db.bannedroomids.get(room_id).await.is_ok() } diff --git a/src/service/rooms/pdu_metadata/data.rs b/src/service/rooms/pdu_metadata/data.rs index f2323475..8e045658 100644 --- a/src/service/rooms/pdu_metadata/data.rs +++ b/src/service/rooms/pdu_metadata/data.rs @@ -94,6 +94,6 @@ impl Data { } pub(super) async fn is_event_soft_failed(&self, event_id: &EventId) -> bool { - self.softfailedeventids.qry(event_id).await.is_ok() + self.softfailedeventids.get(event_id).await.is_ok() } } diff --git a/src/service/rooms/short/mod.rs b/src/service/rooms/short/mod.rs index 20082da2..bd8fdcc9 100644 --- a/src/service/rooms/short/mod.rs +++ b/src/service/rooms/short/mod.rs @@ -197,7 +197,7 @@ pub async fn get_or_create_shortstatehash(&self, state_hash: &[u8]) -> (u64, boo #[implement(Service)] pub async fn get_shortroomid(&self, room_id: &RoomId) -> Result { - self.db.roomid_shortroomid.qry(room_id).await.deserialized() + self.db.roomid_shortroomid.get(room_id).await.deserialized() } #[implement(Service)] diff --git a/src/service/rooms/state_cache/mod.rs b/src/service/rooms/state_cache/mod.rs index b1a71caf..a6c468f5 100644 --- a/src/service/rooms/state_cache/mod.rs +++ b/src/service/rooms/state_cache/mod.rs @@ -342,7 +342,7 @@ impl Service { /// Returns the number of users which are currently in a room #[tracing::instrument(skip(self), level = "debug")] pub async fn room_joined_count(&self, room_id: &RoomId) -> Result { - self.db.roomid_joinedcount.qry(room_id).await.deserialized() + self.db.roomid_joinedcount.get(room_id).await.deserialized() } #[tracing::instrument(skip(self), level = "debug")] @@ -366,7 +366,7 @@ impl Service { pub async fn room_invited_count(&self, room_id: &RoomId) -> Result { self.db .roomid_invitedcount - .qry(room_id) + .get(room_id) .await .deserialized() } diff --git a/src/service/updates/mod.rs b/src/service/updates/mod.rs index 4e16e22b..fca63725 100644 --- a/src/service/updates/mod.rs +++ b/src/service/updates/mod.rs @@ -128,7 +128,7 @@ impl Service { pub async fn last_check_for_updates_id(&self) -> u64 { self.db - .qry(LAST_CHECK_FOR_UPDATES_COUNT) + .get(LAST_CHECK_FOR_UPDATES_COUNT) .await .deserialized() .unwrap_or(0_u64)