mirror of
https://gitlab.com/famedly/conduit.git
synced 2024-09-12 01:09:11 +02:00
Merge branch 'faster-sending' into 'next'
improvement: batch inserts for inserting pdus See merge request famedly/conduit!204
This commit is contained in:
commit
565fe3a7dd
4 changed files with 30 additions and 23 deletions
|
@ -1092,14 +1092,13 @@ pub(crate) async fn invite_helper<'a>(
|
|||
"Could not accept incoming PDU as timeline event.",
|
||||
))?;
|
||||
|
||||
for server in db
|
||||
let servers = db
|
||||
.rooms
|
||||
.room_servers(room_id)
|
||||
.filter_map(|r| r.ok())
|
||||
.filter(|server| &**server != db.globals.server_name())
|
||||
{
|
||||
db.sending.send_pdu(&server, &pdu_id)?;
|
||||
}
|
||||
.filter(|server| &**server != db.globals.server_name());
|
||||
|
||||
db.sending.send_pdu(servers, &pdu_id)?;
|
||||
|
||||
return Ok(());
|
||||
}
|
||||
|
|
|
@ -2104,13 +2104,12 @@ impl Rooms {
|
|||
// where events in the current room state do not exist
|
||||
self.set_room_state(room_id, statehashid)?;
|
||||
|
||||
for server in self
|
||||
let servers = self
|
||||
.room_servers(room_id)
|
||||
.filter_map(|r| r.ok())
|
||||
.filter(|server| &**server != db.globals.server_name())
|
||||
{
|
||||
db.sending.send_pdu(&server, &pdu_id)?;
|
||||
}
|
||||
.filter(|server| &**server != db.globals.server_name());
|
||||
|
||||
db.sending.send_pdu(servers, &pdu_id)?;
|
||||
|
||||
for appservice in db.appservice.all()? {
|
||||
if self.appservice_in_room(room_id, &appservice, db)? {
|
||||
|
|
|
@ -84,7 +84,7 @@ pub enum SendingEventType {
|
|||
pub struct Sending {
|
||||
/// The state for a given state hash.
|
||||
pub(super) servername_educount: Arc<dyn Tree>, // EduCount: Count of last EDU sync
|
||||
pub(super) servernameevent_data: Arc<dyn Tree>, // ServernamEvent = (+ / $)SenderKey / ServerName / UserId + PduId / Id (for edus), Data = EDU content
|
||||
pub(super) servernameevent_data: Arc<dyn Tree>, // ServernameEvent = (+ / $)SenderKey / ServerName / UserId + PduId / Id (for edus), Data = EDU content
|
||||
pub(super) servercurrentevent_data: Arc<dyn Tree>, // ServerCurrentEvents = (+ / $)ServerName / UserId + PduId / Id (for edus), Data = EDU content
|
||||
pub(super) maximum_requests: Arc<Semaphore>,
|
||||
pub sender: mpsc::UnboundedSender<(Vec<u8>, Vec<u8>)>,
|
||||
|
@ -423,13 +423,23 @@ impl Sending {
|
|||
Ok(())
|
||||
}
|
||||
|
||||
#[tracing::instrument(skip(self, server, pdu_id))]
|
||||
pub fn send_pdu(&self, server: &ServerName, pdu_id: &[u8]) -> Result<()> {
|
||||
let mut key = server.as_bytes().to_vec();
|
||||
key.push(0xff);
|
||||
key.extend_from_slice(pdu_id);
|
||||
self.servernameevent_data.insert(&key, &[])?;
|
||||
self.sender.unbounded_send((key, vec![])).unwrap();
|
||||
#[tracing::instrument(skip(self, servers, pdu_id))]
|
||||
pub fn send_pdu<I: Iterator<Item = Box<ServerName>>>(
|
||||
&self,
|
||||
servers: I,
|
||||
pdu_id: &[u8],
|
||||
) -> Result<()> {
|
||||
let mut batch = servers.map(|server| {
|
||||
let mut key = server.as_bytes().to_vec();
|
||||
key.push(0xff);
|
||||
key.extend_from_slice(pdu_id);
|
||||
|
||||
self.sender.unbounded_send((key.clone(), vec![])).unwrap();
|
||||
|
||||
(key, Vec::new())
|
||||
});
|
||||
|
||||
self.servernameevent_data.insert_batch(&mut batch)?;
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
|
|
@ -2880,14 +2880,13 @@ async fn create_join_event(
|
|||
db,
|
||||
)?;
|
||||
|
||||
for server in db
|
||||
let servers = db
|
||||
.rooms
|
||||
.room_servers(room_id)
|
||||
.filter_map(|r| r.ok())
|
||||
.filter(|server| &**server != db.globals.server_name())
|
||||
{
|
||||
db.sending.send_pdu(&server, &pdu_id)?;
|
||||
}
|
||||
.filter(|server| &**server != db.globals.server_name());
|
||||
|
||||
db.sending.send_pdu(servers, &pdu_id)?;
|
||||
|
||||
db.flush()?;
|
||||
|
||||
|
|
Loading…
Reference in a new issue