magmaus3/continuwuity
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

parallelize IO for PublicRoomsChunk vector

Browse source 
Signed-off-by: Jason Volk <jason@zemos.net>
This commit is contained in:
Jason Volk 2025-03-12 23:10:38 +00:00
parent aa4d2e2363
commit 7294368015
1 changed files with 64 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

104
src/api/client/directory.rs
View file

@ -1,7 +1,17 @@
use axum::extract::State; use axum::extract::State;
use axum_client_ip::InsecureClientIp; use axum_client_ip::InsecureClientIp;
use conduwuit::{Err, Error, Result, info, warn}; use conduwuit::{
use futures::{StreamExt, TryFutureExt}; Err, Error, Result, info,
utils::{
TryFutureExtExt,
stream::{ReadyExt, WidebandExt},
},
warn,
};
use futures::{
FutureExt, StreamExt, TryFutureExt,
future::{join, join4, join5},
};
use ruma::{ use ruma::{
OwnedRoomId, RoomId, ServerName, UInt, UserId, OwnedRoomId, RoomId, ServerName, UInt, UserId,
api::{ api::{
@ -287,8 +297,8 @@ pub(crate) async fn get_public_rooms_filtered_helper(
.directory .directory
.public_rooms() .public_rooms()
.map(ToOwned::to_owned) .map(ToOwned::to_owned)
.then(|room_id| public_rooms_chunk(services, room_id)) .wide_then(|room_id| public_rooms_chunk(services, room_id))
.filter_map(|chunk| async move { .ready_filter_map(|chunk| {
if !filter.room_types.is_empty() && !filter.room_types.contains(&RoomTypeFilter::from(chunk.room_type.clone())) { if !filter.room_types.is_empty() && !filter.room_types.contains(&RoomTypeFilter::from(chunk.room_type.clone())) {
return None; return None;
} }
@ -394,43 +404,23 @@ async fn user_can_publish_room(
} }
async fn public_rooms_chunk(services: &Services, room_id: OwnedRoomId) -> PublicRoomsChunk { async fn public_rooms_chunk(services: &Services, room_id: OwnedRoomId) -> PublicRoomsChunk {
PublicRoomsChunk { let name = services.rooms.state_accessor.get_name(&room_id).ok();
canonical_alias: services
let room_type = services.rooms.state_accessor.get_room_type(&room_id).ok();
let canonical_alias = services
.rooms .rooms
.state_accessor .state_accessor
.get_canonical_alias(&room_id) .get_canonical_alias(&room_id)
.await .ok();
.ok(),
name: services.rooms.state_accessor.get_name(&room_id).await.ok(), let avatar_url = services.rooms.state_accessor.get_avatar(&room_id);
num_joined_members: services
.rooms let topic = services.rooms.state_accessor.get_room_topic(&room_id).ok();
.state_cache
.room_joined_count(&room_id) let world_readable = services.rooms.state_accessor.is_world_readable(&room_id);
.await
.unwrap_or(0) let join_rule = services
.try_into()
.expect("joined count overflows ruma UInt"),
topic: services
.rooms
.state_accessor
.get_room_topic(&room_id)
.await
.ok(),
world_readable: services
.rooms
.state_accessor
.is_world_readable(&room_id)
.await,
guest_can_join: services.rooms.state_accessor.guest_can_join(&room_id).await,
avatar_url: services
.rooms
.state_accessor
.get_avatar(&room_id)
.await
.into_option()
.unwrap_or_default()
.url,
join_rule: services
.rooms .rooms
.state_accessor .state_accessor
.room_state_get_content(&room_id, &StateEventType::RoomJoinRules, "") .room_state_get_content(&room_id, &StateEventType::RoomJoinRules, "")
@ -439,15 +429,35 @@ async fn public_rooms_chunk(services: &Services, room_id: OwnedRoomId) -> Public
| JoinRule::Knock => "knock".into(), | JoinRule::Knock => "knock".into(),
| JoinRule::KnockRestricted(_) => "knock_restricted".into(), | JoinRule::KnockRestricted(_) => "knock_restricted".into(),
| _ => "invite".into(), | _ => "invite".into(),
}) });
.await
.unwrap_or_default(), let guest_can_join = services.rooms.state_accessor.guest_can_join(&room_id);
room_type: services
.rooms let num_joined_members = services.rooms.state_cache.room_joined_count(&room_id);
.state_accessor
.get_room_type(&room_id) let (
.await (avatar_url, canonical_alias, guest_can_join, join_rule, name),
.ok(), (num_joined_members, room_type, topic, world_readable),
) = join(
join5(avatar_url, canonical_alias, guest_can_join, join_rule, name),
join4(num_joined_members, room_type, topic, world_readable),
)
.boxed()
.await;
PublicRoomsChunk {
avatar_url: avatar_url.into_option().unwrap_or_default().url,
canonical_alias,
guest_can_join,
join_rule: join_rule.unwrap_or_default(),
name,
num_joined_members: num_joined_members
.unwrap_or(0)
.try_into()
.expect("joined count overflows ruma UInt"),
room_id, room_id,
room_type,
topic,
world_readable,
} }
} }