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

return stream from multi_get_eventid_from_short

Browse source 
Signed-off-by: Jason Volk <jason@zemos.net>
This commit is contained in:
Jason Volk 2024-12-03 09:42:26 +00:00
parent 48703173bc
commit 784ccd6bad
5 changed files with 39 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

43
src/service/rooms/state_accessor/data.rs
View file

@ -1,12 +1,12 @@
use std::{borrow::Borrow, collections::HashMap, sync::Arc};
use conduit::{
at, err,
utils::stream::{BroadbandExt, IterStream},
at, err, ref_at,
utils::stream::{BroadbandExt, IterStream, ReadyExt},
PduEvent, Result,
};
use database::{Deserialized, Map};
use futures::{StreamExt, TryFutureExt};
use futures::{FutureExt, StreamExt, TryFutureExt};
use ruma::{events::StateEventType, EventId, OwnedEventId, RoomId};
use serde::Deserialize;
@ -59,23 +59,13 @@ impl Data {
}
pub(super) async fn state_full_pdus(&self, shortstatehash: ShortStateHash) -> Result<Vec<PduEvent>> {
let short_ids = self
.state_full_shortids(shortstatehash)
.await?
.into_iter()
.map(at!(1));
let short_ids = self.state_full_shortids(shortstatehash).await?;
let event_ids = self
let full_pdus = self
.services
.short
.multi_get_eventid_from_short(short_ids)
.await
.into_iter()
.filter_map(Result::ok);
let full_pdus = event_ids
.into_iter()
.stream()
.multi_get_eventid_from_short(short_ids.iter().map(ref_at!(1)))
.ready_filter_map(Result::ok)
.broad_filter_map(
|event_id: OwnedEventId| async move { self.services.timeline.get_pdu(&event_id).await.ok() },
)
@ -92,19 +82,16 @@ impl Data {
{
let short_ids = self.state_full_shortids(shortstatehash).await?;
let event_ids = self
let full_ids = self
.services
.short
.multi_get_eventid_from_short(short_ids.iter().map(at!(1)))
.multi_get_eventid_from_short(short_ids.iter().map(ref_at!(1)))
.zip(short_ids.iter().stream().map(at!(0)))
.ready_filter_map(|(event_id, shortstatekey)| Some((shortstatekey, event_id.ok()?)))
.collect()
.boxed()
.await;
let full_ids = short_ids
.into_iter()
.map(at!(0))
.zip(event_ids.into_iter())
.filter_map(|(shortstatekey, event_id)| Some((shortstatekey, event_id.ok()?)))
.collect();
Ok(full_ids)
}
@ -134,7 +121,7 @@ impl Data {
&self, shortstatehash: ShortStateHash, event_type: &StateEventType, state_key: &str,
) -> Result<Id>
where
Id: for<'de> Deserialize<'de> + Send + Sized + ToOwned,
Id: for<'de> Deserialize<'de> + Sized + ToOwned,
<Id as ToOwned>::Owned: Borrow<EventId>,
{
let shortstatekey = self
@ -219,7 +206,7 @@ impl Data {
&self, room_id: &RoomId, event_type: &StateEventType, state_key: &str,
) -> Result<Id>
where
Id: for<'de> Deserialize<'de> + Send + Sized + ToOwned,
Id: for<'de> Deserialize<'de> + Sized + ToOwned,
<Id as ToOwned>::Owned: Borrow<EventId>,
{
self.services

10
src/service/rooms/state_accessor/mod.rs
View file

@ -102,7 +102,7 @@ impl Service {
/// 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), level = "debug")]
pub async fn state_full_ids<Id>(&self, shortstatehash: ShortStateHash) -> Result<HashMap<u64, Id>>
pub async fn state_full_ids<Id>(&self, shortstatehash: ShortStateHash) -> Result<HashMap<ShortStateKey, Id>>
where
Id: for<'de> Deserialize<'de> + Send + Sized + ToOwned,
<Id as ToOwned>::Owned: Borrow<EventId>,
@ -130,7 +130,7 @@ impl Service {
&self, shortstatehash: ShortStateHash, event_type: &StateEventType, state_key: &str,
) -> Result<Id>
where
Id: for<'de> Deserialize<'de> + Send + Sized + ToOwned,
Id: for<'de> Deserialize<'de> + Sized + ToOwned,
<Id as ToOwned>::Owned: Borrow<EventId>,
{
self.db
@ -154,7 +154,7 @@ impl Service {
&self, shortstatehash: ShortStateHash, event_type: &StateEventType, state_key: &str,
) -> Result<T>
where
T: for<'de> Deserialize<'de> + Send,
T: for<'de> Deserialize<'de>,
{
self.state_get(shortstatehash, event_type, state_key)
.await
@ -337,7 +337,7 @@ impl Service {
&self, room_id: &RoomId, event_type: &StateEventType, state_key: &str,
) -> Result<Id>
where
Id: for<'de> Deserialize<'de> + Send + Sized + ToOwned,
Id: for<'de> Deserialize<'de> + Sized + ToOwned,
<Id as ToOwned>::Owned: Borrow<EventId>,
{
self.db
@ -359,7 +359,7 @@ impl Service {
&self, room_id: &RoomId, event_type: &StateEventType, state_key: &str,
) -> Result<T>
where
T: for<'de> Deserialize<'de> + Send,
T: for<'de> Deserialize<'de>,
{
self.room_state_get(room_id, event_type, state_key)
.await