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

furnish batch interface with trait

Browse source 
Signed-off-by: Jason Volk <jason@zemos.net>
This commit is contained in:
Jason Volk 2025-01-26 03:30:34 +00:00
parent 4a2d0d35bc
commit d0b4a619af
8 changed files with 155 additions and 93 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -7,7 +7,7 @@ use conduwuit::{
utils::{stream::TryIgnore, IterStream, ReadyExt},
Result,
};
use database::{Database, Deserialized, Handle, Interfix, Map};
use database::{Database, Deserialized, Handle, Interfix, Map, Qry};
use futures::{pin_mut, Stream, StreamExt};
use ruma::{api::client::filter::LazyLoadOptions, DeviceId, OwnedUserId, RoomId, UserId};
@ -115,9 +115,11 @@ where
let make_key =
|sender: &'a UserId| -> Key<'a> { (ctx.user_id, ctx.device_id, ctx.room_id, sender) };
self.db
.lazyloadedids
.qry_batch(senders.clone().stream().map(make_key))
senders
.clone()
.stream()
.map(make_key)
.qry(&self.db.lazyloadedids)
.map(into_status)
.zip(senders.stream())
.map(move |(status, sender)| {

19
src/service/rooms/short/mod.rs
View file

@ -2,7 +2,7 @@ use std::{borrow::Borrow, fmt::Debug, mem::size_of_val, sync::Arc};
pub use conduwuit::pdu::{ShortEventId, ShortId, ShortRoomId};
use conduwuit::{err, implement, utils, utils::IterStream, Result};
use database::{Deserialized, Map};
use database::{Deserialized, Get, Map, Qry};
use futures::{Stream, StreamExt};
use ruma::{events::StateEventType, EventId, RoomId};
use serde::Deserialize;
@ -67,9 +67,10 @@ pub fn multi_get_or_create_shorteventid<'a, I>(
where
I: Iterator<Item = &'a EventId> + Clone + Debug + Send + 'a,
{
self.db
.eventid_shorteventid
.get_batch(event_ids.clone().stream())
event_ids
.clone()
.stream()
.get(&self.db.eventid_shorteventid)
.zip(event_ids.into_iter().stream())
.map(|(result, event_id)| match result {
| Ok(ref short) => utils::u64_from_u8(short),
@ -171,9 +172,8 @@ where
Id: for<'de> Deserialize<'de> + Sized + ToOwned + 'a,
<Id as ToOwned>::Owned: Borrow<EventId>,
{
self.db
.shorteventid_eventid
.qry_batch(shorteventid)
shorteventid
.qry(&self.db.shorteventid_eventid)
.map(Deserialized::deserialized)
}
@ -204,9 +204,8 @@ pub fn multi_get_statekey_from_short<'a, S>(
where
S: Stream<Item = ShortStateKey> + Send + 'a,
{
self.db
.shortstatekey_statekey
.qry_batch(shortstatekey)
shortstatekey
.qry(&self.db.shortstatekey_statekey)
.map(Deserialized::deserialized)
}