TudbuT/conduit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improve sync performance with more caching and wrapping things in Arcs to avoid copies

Browse source
This commit is contained in:
Timo Kösters 2023-06-27 13:06:55 +02:00
parent 7c6d25dcd1
commit be877ef719
No known key found for this signature in database
GPG key ID: 0B25E636FBA7E4CB
12 changed files with 112 additions and 98 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
Cargo.lock generated
View file

@ -2110,7 +2110,7 @@ dependencies = [
[[package]] [[package]]
name = "ruma" name = "ruma"
version = "0.8.2" version = "0.8.2"
source = "git+https://github.com/ruma/ruma?rev=de9a5a6ecca197e59623c210bd21f53055f83568#de9a5a6ecca197e59623c210bd21f53055f83568" source = "git+https://github.com/ruma/ruma?rev=38294bd5206498c02b1001227d65654eb548308b#38294bd5206498c02b1001227d65654eb548308b"
dependencies = [ dependencies = [
"assign", "assign",
"js_int", "js_int",
@ -2128,7 +2128,7 @@ dependencies = [
[[package]] [[package]]
name = "ruma-appservice-api" name = "ruma-appservice-api"
version = "0.8.1" version = "0.8.1"
source = "git+https://github.com/ruma/ruma?rev=de9a5a6ecca197e59623c210bd21f53055f83568#de9a5a6ecca197e59623c210bd21f53055f83568" source = "git+https://github.com/ruma/ruma?rev=38294bd5206498c02b1001227d65654eb548308b#38294bd5206498c02b1001227d65654eb548308b"
dependencies = [ dependencies = [
"js_int", "js_int",
"ruma-common", "ruma-common",
@ -2139,7 +2139,7 @@ dependencies = [
[[package]] [[package]]
name = "ruma-client-api" name = "ruma-client-api"
version = "0.16.2" version = "0.16.2"
source = "git+https://github.com/ruma/ruma?rev=de9a5a6ecca197e59623c210bd21f53055f83568#de9a5a6ecca197e59623c210bd21f53055f83568" source = "git+https://github.com/ruma/ruma?rev=38294bd5206498c02b1001227d65654eb548308b#38294bd5206498c02b1001227d65654eb548308b"
dependencies = [ dependencies = [
"assign", "assign",
"bytes", "bytes",
@ -2156,7 +2156,7 @@ dependencies = [
[[package]] [[package]]
name = "ruma-common" name = "ruma-common"
version = "0.11.3" version = "0.11.3"
source = "git+https://github.com/ruma/ruma?rev=de9a5a6ecca197e59623c210bd21f53055f83568#de9a5a6ecca197e59623c210bd21f53055f83568" source = "git+https://github.com/ruma/ruma?rev=38294bd5206498c02b1001227d65654eb548308b#38294bd5206498c02b1001227d65654eb548308b"
dependencies = [ dependencies = [
"base64 0.21.2", "base64 0.21.2",
"bytes", "bytes",
@ -2184,7 +2184,7 @@ dependencies = [
[[package]] [[package]]
name = "ruma-federation-api" name = "ruma-federation-api"
version = "0.7.1" version = "0.7.1"
source = "git+https://github.com/ruma/ruma?rev=de9a5a6ecca197e59623c210bd21f53055f83568#de9a5a6ecca197e59623c210bd21f53055f83568" source = "git+https://github.com/ruma/ruma?rev=38294bd5206498c02b1001227d65654eb548308b#38294bd5206498c02b1001227d65654eb548308b"
dependencies = [ dependencies = [
"js_int", "js_int",
"ruma-common", "ruma-common",
@ -2195,7 +2195,7 @@ dependencies = [
[[package]] [[package]]
name = "ruma-identifiers-validation" name = "ruma-identifiers-validation"
version = "0.9.1" version = "0.9.1"
source = "git+https://github.com/ruma/ruma?rev=de9a5a6ecca197e59623c210bd21f53055f83568#de9a5a6ecca197e59623c210bd21f53055f83568" source = "git+https://github.com/ruma/ruma?rev=38294bd5206498c02b1001227d65654eb548308b#38294bd5206498c02b1001227d65654eb548308b"
dependencies = [ dependencies = [
"js_int", "js_int",
"thiserror", "thiserror",
@ -2204,7 +2204,7 @@ dependencies = [
[[package]] [[package]]
name = "ruma-identity-service-api" name = "ruma-identity-service-api"
version = "0.7.1" version = "0.7.1"
source = "git+https://github.com/ruma/ruma?rev=de9a5a6ecca197e59623c210bd21f53055f83568#de9a5a6ecca197e59623c210bd21f53055f83568" source = "git+https://github.com/ruma/ruma?rev=38294bd5206498c02b1001227d65654eb548308b#38294bd5206498c02b1001227d65654eb548308b"
dependencies = [ dependencies = [
"js_int", "js_int",
"ruma-common", "ruma-common",
@ -2214,7 +2214,7 @@ dependencies = [
[[package]] [[package]]
name = "ruma-macros" name = "ruma-macros"
version = "0.11.3" version = "0.11.3"
source = "git+https://github.com/ruma/ruma?rev=de9a5a6ecca197e59623c210bd21f53055f83568#de9a5a6ecca197e59623c210bd21f53055f83568" source = "git+https://github.com/ruma/ruma?rev=38294bd5206498c02b1001227d65654eb548308b#38294bd5206498c02b1001227d65654eb548308b"
dependencies = [ dependencies = [
"once_cell", "once_cell",
"proc-macro-crate", "proc-macro-crate",
@ -2229,7 +2229,7 @@ dependencies = [
[[package]] [[package]]
name = "ruma-push-gateway-api" name = "ruma-push-gateway-api"
version = "0.7.1" version = "0.7.1"
source = "git+https://github.com/ruma/ruma?rev=de9a5a6ecca197e59623c210bd21f53055f83568#de9a5a6ecca197e59623c210bd21f53055f83568" source = "git+https://github.com/ruma/ruma?rev=38294bd5206498c02b1001227d65654eb548308b#38294bd5206498c02b1001227d65654eb548308b"
dependencies = [ dependencies = [
"js_int", "js_int",
"ruma-common", "ruma-common",
@ -2240,7 +2240,7 @@ dependencies = [
[[package]] [[package]]
name = "ruma-signatures" name = "ruma-signatures"
version = "0.13.1" version = "0.13.1"
source = "git+https://github.com/ruma/ruma?rev=de9a5a6ecca197e59623c210bd21f53055f83568#de9a5a6ecca197e59623c210bd21f53055f83568" source = "git+https://github.com/ruma/ruma?rev=38294bd5206498c02b1001227d65654eb548308b#38294bd5206498c02b1001227d65654eb548308b"
dependencies = [ dependencies = [
"base64 0.21.2", "base64 0.21.2",
"ed25519-dalek", "ed25519-dalek",
@ -2256,7 +2256,7 @@ dependencies = [
[[package]] [[package]]
name = "ruma-state-res" name = "ruma-state-res"
version = "0.9.1" version = "0.9.1"
source = "git+https://github.com/ruma/ruma?rev=de9a5a6ecca197e59623c210bd21f53055f83568#de9a5a6ecca197e59623c210bd21f53055f83568" source = "git+https://github.com/ruma/ruma?rev=38294bd5206498c02b1001227d65654eb548308b#38294bd5206498c02b1001227d65654eb548308b"
dependencies = [ dependencies = [
"itertools", "itertools",
"js_int", "js_int",

2
Cargo.toml
View file

@ -26,7 +26,7 @@ tower-http = { version = "0.4.1", features = ["add-extension", "cors", "sensitiv
# Used for matrix spec type definitions and helpers # Used for matrix spec type definitions and helpers
#ruma = { version = "0.4.0", features = ["compat", "rand", "appservice-api-c", "client-api", "federation-api", "push-gateway-api-c", "state-res", "unstable-pre-spec", "unstable-exhaustive-types"] } #ruma = { version = "0.4.0", features = ["compat", "rand", "appservice-api-c", "client-api", "federation-api", "push-gateway-api-c", "state-res", "unstable-pre-spec", "unstable-exhaustive-types"] }
ruma = { git = "https://github.com/ruma/ruma", rev = "de9a5a6ecca197e59623c210bd21f53055f83568", features = ["compat", "rand", "appservice-api-c", "client-api", "federation-api", "push-gateway-api-c", "state-res", "unstable-msc2448", "unstable-exhaustive-types", "ring-compat", "unstable-unspecified" ] } ruma = { git = "https://github.com/ruma/ruma", rev = "38294bd5206498c02b1001227d65654eb548308b", features = ["compat", "rand", "appservice-api-c", "client-api", "federation-api", "push-gateway-api-c", "state-res", "unstable-msc2448", "unstable-exhaustive-types", "ring-compat", "unstable-unspecified" ] }
#ruma = { git = "https://github.com/timokoesters/ruma", rev = "50c1db7e0a3a21fc794b0cce3b64285a4c750c71", features = ["compat", "rand", "appservice-api-c", "client-api", "federation-api", "push-gateway-api-c", "state-res", "unstable-pre-spec", "unstable-exhaustive-types"] } #ruma = { git = "https://github.com/timokoesters/ruma", rev = "50c1db7e0a3a21fc794b0cce3b64285a4c750c71", features = ["compat", "rand", "appservice-api-c", "client-api", "federation-api", "push-gateway-api-c", "state-res", "unstable-pre-spec", "unstable-exhaustive-types"] }
#ruma = { path = "../ruma/crates/ruma", features = ["compat", "rand", "appservice-api-c", "client-api", "federation-api", "push-gateway-api-c", "state-res", "unstable-pre-spec", "unstable-exhaustive-types"] } #ruma = { path = "../ruma/crates/ruma", features = ["compat", "rand", "appservice-api-c", "client-api", "federation-api", "push-gateway-api-c", "state-res", "unstable-pre-spec", "unstable-exhaustive-types"] }

20
src/api/client_server/membership.rs
View file

@ -743,15 +743,17 @@ async fn join_room_by_id_helper(
info!("Saving state from send_join"); info!("Saving state from send_join");
let (statehash_before_join, new, removed) = services().rooms.state_compressor.save_state( let (statehash_before_join, new, removed) = services().rooms.state_compressor.save_state(
room_id, room_id,
state Arc::new(
.into_iter() state
.map(|(k, id)| { .into_iter()
services() .map(|(k, id)| {
.rooms services()
.state_compressor .rooms
.compress_state_event(k, &id) .state_compressor
}) .compress_state_event(k, &id)
.collect::<Result<_>>()?, })
.collect::<Result<_>>()?,
),
)?; )?;
services() services()

6
src/database/key_value/rooms/state_accessor.rs
View file

@ -16,7 +16,7 @@ impl service::rooms::state_accessor::Data for KeyValueDatabase {
.1; .1;
let mut result = HashMap::new(); let mut result = HashMap::new();
let mut i = 0; let mut i = 0;
for compressed in full_state.into_iter() { for compressed in full_state.iter() {
let parsed = services() let parsed = services()
.rooms .rooms
.state_compressor .state_compressor
@ -45,7 +45,7 @@ impl service::rooms::state_accessor::Data for KeyValueDatabase {
let mut result = HashMap::new(); let mut result = HashMap::new();
let mut i = 0; let mut i = 0;
for compressed in full_state { for compressed in full_state.iter() {
let (_, eventid) = services() let (_, eventid) = services()
.rooms .rooms
.state_compressor .state_compressor
@ -95,7 +95,7 @@ impl service::rooms::state_accessor::Data for KeyValueDatabase {
.expect("there is always one layer") .expect("there is always one layer")
.1; .1;
Ok(full_state Ok(full_state
.into_iter() .iter()
.find(|bytes| bytes.starts_with(&shortstatekey.to_be_bytes())) .find(|bytes| bytes.starts_with(&shortstatekey.to_be_bytes()))
.and_then(|compressed| { .and_then(|compressed| {
services() services()

10
src/database/key_value/rooms/state_compressor.rs
View file

@ -1,4 +1,4 @@
use std::{collections::HashSet, mem::size_of}; use std::{collections::HashSet, mem::size_of, sync::Arc};
use crate::{ use crate::{
database::KeyValueDatabase, database::KeyValueDatabase,
@ -37,20 +37,20 @@ impl service::rooms::state_compressor::Data for KeyValueDatabase {
Ok(StateDiff { Ok(StateDiff {
parent, parent,
added, added: Arc::new(added),
removed, removed: Arc::new(removed),
}) })
} }
fn save_statediff(&self, shortstatehash: u64, diff: StateDiff) -> Result<()> { fn save_statediff(&self, shortstatehash: u64, diff: StateDiff) -> Result<()> {
let mut value = diff.parent.unwrap_or(0).to_be_bytes().to_vec(); let mut value = diff.parent.unwrap_or(0).to_be_bytes().to_vec();
for new in &diff.added { for new in diff.added.iter() {
value.extend_from_slice(&new[..]); value.extend_from_slice(&new[..]);
} }
if !diff.removed.is_empty() { if !diff.removed.is_empty() {
value.extend_from_slice(&0_u64.to_be_bytes()); value.extend_from_slice(&0_u64.to_be_bytes());
for removed in &diff.removed { for removed in diff.removed.iter() {
value.extend_from_slice(&removed[..]); value.extend_from_slice(&removed[..]);
} }
} }

4
src/database/mod.rs
View file

@ -587,8 +587,8 @@ impl KeyValueDatabase {
services().rooms.state_compressor.save_state_from_diff( services().rooms.state_compressor.save_state_from_diff(
current_sstatehash, current_sstatehash,
statediffnew, Arc::new(statediffnew),
statediffremoved, Arc::new(statediffremoved),
2, // every state change is 2 event changes on average 2, // every state change is 2 event changes on average
states_parents, states_parents,
)?; )?;

2
src/service/mod.rs
View file

@ -90,7 +90,7 @@ impl Services {
state_compressor: rooms::state_compressor::Service { state_compressor: rooms::state_compressor::Service {
db, db,
stateinfo_cache: Mutex::new(LruCache::new( stateinfo_cache: Mutex::new(LruCache::new(
(100.0 * config.conduit_cache_capacity_modifier) as usize, (1000.0 * config.conduit_cache_capacity_modifier) as usize,
)), )),
}, },
timeline: rooms::timeline::Service { timeline: rooms::timeline::Service {

24
src/service/rooms/event_handler/mod.rs
View file

@ -774,15 +774,17 @@ impl Service {
}); });
info!("Compressing state at event"); info!("Compressing state at event");
let state_ids_compressed = state_at_incoming_event let state_ids_compressed = Arc::new(
.iter() state_at_incoming_event
.map(|(shortstatekey, id)| { .iter()
services() .map(|(shortstatekey, id)| {
.rooms services()
.state_compressor .rooms
.compress_state_event(*shortstatekey, id) .state_compressor
}) .compress_state_event(*shortstatekey, id)
.collect::<Result<_>>()?; })
.collect::<Result<_>>()?,
);
if incoming_pdu.state_key.is_some() { if incoming_pdu.state_key.is_some() {
info!("Preparing for stateres to derive new room state"); info!("Preparing for stateres to derive new room state");
@ -886,7 +888,7 @@ impl Service {
room_id: &RoomId, room_id: &RoomId,
room_version_id: &RoomVersionId, room_version_id: &RoomVersionId,
incoming_state: HashMap<u64, Arc<EventId>>, incoming_state: HashMap<u64, Arc<EventId>>,
) -> Result<HashSet<CompressedStateEvent>> { ) -> Result<Arc<HashSet<CompressedStateEvent>>> {
info!("Loading current room state ids"); info!("Loading current room state ids");
let current_sstatehash = services() let current_sstatehash = services()
.rooms .rooms
@ -966,7 +968,7 @@ impl Service {
}) })
.collect::<Result<_>>()?; .collect::<Result<_>>()?;
Ok(new_room_state) Ok(Arc::new(new_room_state))
} }
/// Find the event and auth it. Once the event is validated (steps 1 - 8) /// Find the event and auth it. Once the event is validated (steps 1 - 8)

18
src/service/rooms/state/mod.rs
View file

@ -32,11 +32,11 @@ impl Service {
&self, &self,
room_id: &RoomId, room_id: &RoomId,
shortstatehash: u64, shortstatehash: u64,
statediffnew: HashSet<CompressedStateEvent>, statediffnew: Arc<HashSet<CompressedStateEvent>>,
_statediffremoved: HashSet<CompressedStateEvent>, _statediffremoved: Arc<HashSet<CompressedStateEvent>>,
state_lock: &MutexGuard<'_, ()>, // Take mutex guard to make sure users get the room state mutex state_lock: &MutexGuard<'_, ()>, // Take mutex guard to make sure users get the room state mutex
) -> Result<()> { ) -> Result<()> {
for event_id in statediffnew.into_iter().filter_map(|new| { for event_id in statediffnew.iter().filter_map(|new| {
services() services()
.rooms .rooms
.state_compressor .state_compressor
@ -107,7 +107,7 @@ impl Service {
&self, &self,
event_id: &EventId, event_id: &EventId,
room_id: &RoomId, room_id: &RoomId,
state_ids_compressed: HashSet<CompressedStateEvent>, state_ids_compressed: Arc<HashSet<CompressedStateEvent>>,
) -> Result<u64> { ) -> Result<u64> {
let shorteventid = services() let shorteventid = services()
.rooms .rooms
@ -152,9 +152,9 @@ impl Service {
.copied() .copied()
.collect(); .collect();
(statediffnew, statediffremoved) (Arc::new(statediffnew), Arc::new(statediffremoved))
} else { } else {
(state_ids_compressed, HashSet::new()) (state_ids_compressed, Arc::new(HashSet::new()))
}; };
services().rooms.state_compressor.save_state_from_diff( services().rooms.state_compressor.save_state_from_diff(
shortstatehash, shortstatehash,
@ -234,8 +234,8 @@ impl Service {
services().rooms.state_compressor.save_state_from_diff( services().rooms.state_compressor.save_state_from_diff(
shortstatehash, shortstatehash,
statediffnew, Arc::new(statediffnew),
statediffremoved, Arc::new(statediffremoved),
2, 2,
states_parents, states_parents,
)?; )?;
@ -396,7 +396,7 @@ impl Service {
.1; .1;
Ok(full_state Ok(full_state
.into_iter() .iter()
.filter_map(|compressed| { .filter_map(|compressed| {
services() services()
.rooms .rooms

6
src/service/rooms/state_compressor/data.rs
View file

@ -1,12 +1,12 @@
use std::collections::HashSet; use std::{collections::HashSet, sync::Arc};
use super::CompressedStateEvent; use super::CompressedStateEvent;
use crate::Result; use crate::Result;
pub struct StateDiff { pub struct StateDiff {
pub parent: Option<u64>, pub parent: Option<u64>,
pub added: HashSet<CompressedStateEvent>, pub added: Arc<HashSet<CompressedStateEvent>>,
pub removed: HashSet<CompressedStateEvent>, pub removed: Arc<HashSet<CompressedStateEvent>>,
} }
pub trait Data: Send + Sync { pub trait Data: Send + Sync {

94
src/service/rooms/state_compressor/mod.rs
View file

@ -20,10 +20,10 @@ pub struct Service {
LruCache< LruCache<
u64, u64,
Vec<( Vec<(
u64, // sstatehash u64, // sstatehash
HashSet<CompressedStateEvent>, // full state Arc<HashSet<CompressedStateEvent>>, // full state
HashSet<CompressedStateEvent>, // added Arc<HashSet<CompressedStateEvent>>, // added
HashSet<CompressedStateEvent>, // removed Arc<HashSet<CompressedStateEvent>>, // removed
)>, )>,
>, >,
>, >,
@ -39,10 +39,10 @@ impl Service {
shortstatehash: u64, shortstatehash: u64,
) -> Result< ) -> Result<
Vec<( Vec<(
u64, // sstatehash u64, // sstatehash
HashSet<CompressedStateEvent>, // full state Arc<HashSet<CompressedStateEvent>>, // full state
HashSet<CompressedStateEvent>, // added Arc<HashSet<CompressedStateEvent>>, // added
HashSet<CompressedStateEvent>, // removed Arc<HashSet<CompressedStateEvent>>, // removed
)>, )>,
> { > {
if let Some(r) = self if let Some(r) = self
@ -62,13 +62,19 @@ impl Service {
if let Some(parent) = parent { if let Some(parent) = parent {
let mut response = self.load_shortstatehash_info(parent)?; let mut response = self.load_shortstatehash_info(parent)?;
let mut state = response.last().unwrap().1.clone(); let mut state = (*response.last().unwrap().1).clone();
state.extend(added.iter().copied()); state.extend(added.iter().copied());
let removed = (*removed).clone();
for r in &removed { for r in &removed {
state.remove(r); state.remove(r);
} }
response.push((shortstatehash, state, added, removed)); response.push((shortstatehash, Arc::new(state), added, Arc::new(removed)));
self.stateinfo_cache
.lock()
.unwrap()
.insert(shortstatehash, response.clone());
Ok(response) Ok(response)
} else { } else {
@ -135,14 +141,14 @@ impl Service {
pub fn save_state_from_diff( pub fn save_state_from_diff(
&self, &self,
shortstatehash: u64, shortstatehash: u64,
statediffnew: HashSet<CompressedStateEvent>, statediffnew: Arc<HashSet<CompressedStateEvent>>,
statediffremoved: HashSet<CompressedStateEvent>, statediffremoved: Arc<HashSet<CompressedStateEvent>>,
diff_to_sibling: usize, diff_to_sibling: usize,
mut parent_states: Vec<( mut parent_states: Vec<(
u64, // sstatehash u64, // sstatehash
HashSet<CompressedStateEvent>, // full state Arc<HashSet<CompressedStateEvent>>, // full state
HashSet<CompressedStateEvent>, // added Arc<HashSet<CompressedStateEvent>>, // added
HashSet<CompressedStateEvent>, // removed Arc<HashSet<CompressedStateEvent>>, // removed
)>, )>,
) -> Result<()> { ) -> Result<()> {
let diffsum = statediffnew.len() + statediffremoved.len(); let diffsum = statediffnew.len() + statediffremoved.len();
@ -152,29 +158,29 @@ impl Service {
// To many layers, we have to go deeper // To many layers, we have to go deeper
let parent = parent_states.pop().unwrap(); let parent = parent_states.pop().unwrap();
let mut parent_new = parent.2; let mut parent_new = (*parent.2).clone();
let mut parent_removed = parent.3; let mut parent_removed = (*parent.3).clone();
for removed in statediffremoved { for removed in statediffremoved.iter() {
if !parent_new.remove(&removed) { if !parent_new.remove(removed) {
// It was not added in the parent and we removed it // It was not added in the parent and we removed it
parent_removed.insert(removed); parent_removed.insert(removed.clone());
} }
// Else it was added in the parent and we removed it again. We can forget this change // Else it was added in the parent and we removed it again. We can forget this change
} }
for new in statediffnew { for new in statediffnew.iter() {
if !parent_removed.remove(&new) { if !parent_removed.remove(new) {
// It was not touched in the parent and we added it // It was not touched in the parent and we added it
parent_new.insert(new); parent_new.insert(new.clone());
} }
// Else it was removed in the parent and we added it again. We can forget this change // Else it was removed in the parent and we added it again. We can forget this change
} }
self.save_state_from_diff( self.save_state_from_diff(
shortstatehash, shortstatehash,
parent_new, Arc::new(parent_new),
parent_removed, Arc::new(parent_removed),
diffsum, diffsum,
parent_states, parent_states,
)?; )?;
@ -205,29 +211,29 @@ impl Service {
if diffsum * diffsum >= 2 * diff_to_sibling * parent_diff { if diffsum * diffsum >= 2 * diff_to_sibling * parent_diff {
// Diff too big, we replace above layer(s) // Diff too big, we replace above layer(s)
let mut parent_new = parent.2; let mut parent_new = (*parent.2).clone();
let mut parent_removed = parent.3; let mut parent_removed = (*parent.3).clone();
for removed in statediffremoved { for removed in statediffremoved.iter() {
if !parent_new.remove(&removed) { if !parent_new.remove(removed) {
// It was not added in the parent and we removed it // It was not added in the parent and we removed it
parent_removed.insert(removed); parent_removed.insert(removed.clone());
} }
// Else it was added in the parent and we removed it again. We can forget this change // Else it was added in the parent and we removed it again. We can forget this change
} }
for new in statediffnew { for new in statediffnew.iter() {
if !parent_removed.remove(&new) { if !parent_removed.remove(new) {
// It was not touched in the parent and we added it // It was not touched in the parent and we added it
parent_new.insert(new); parent_new.insert(new.clone());
} }
// Else it was removed in the parent and we added it again. We can forget this change // Else it was removed in the parent and we added it again. We can forget this change
} }
self.save_state_from_diff( self.save_state_from_diff(
shortstatehash, shortstatehash,
parent_new, Arc::new(parent_new),
parent_removed, Arc::new(parent_removed),
diffsum, diffsum,
parent_states, parent_states,
)?; )?;
@ -250,11 +256,11 @@ impl Service {
pub fn save_state( pub fn save_state(
&self, &self,
room_id: &RoomId, room_id: &RoomId,
new_state_ids_compressed: HashSet<CompressedStateEvent>, new_state_ids_compressed: Arc<HashSet<CompressedStateEvent>>,
) -> Result<( ) -> Result<(
u64, u64,
HashSet<CompressedStateEvent>, Arc<HashSet<CompressedStateEvent>>,
HashSet<CompressedStateEvent>, Arc<HashSet<CompressedStateEvent>>,
)> { )> {
let previous_shortstatehash = services().rooms.state.get_room_shortstatehash(room_id)?; let previous_shortstatehash = services().rooms.state.get_room_shortstatehash(room_id)?;
@ -271,7 +277,11 @@ impl Service {
.get_or_create_shortstatehash(&state_hash)?; .get_or_create_shortstatehash(&state_hash)?;
if Some(new_shortstatehash) == previous_shortstatehash { if Some(new_shortstatehash) == previous_shortstatehash {
return Ok((new_shortstatehash, HashSet::new(), HashSet::new())); return Ok((
new_shortstatehash,
Arc::new(HashSet::new()),
Arc::new(HashSet::new()),
));
} }
let states_parents = previous_shortstatehash let states_parents = previous_shortstatehash
@ -290,9 +300,9 @@ impl Service {
.copied() .copied()
.collect(); .collect();
(statediffnew, statediffremoved) (Arc::new(statediffnew), Arc::new(statediffremoved))
} else { } else {
(new_state_ids_compressed, HashSet::new()) (new_state_ids_compressed, Arc::new(HashSet::new()))
}; };
if !already_existed { if !already_existed {

2
src/service/rooms/timeline/mod.rs
View file

@ -946,7 +946,7 @@ impl Service {
pdu: &PduEvent, pdu: &PduEvent,
pdu_json: CanonicalJsonObject, pdu_json: CanonicalJsonObject,
new_room_leaves: Vec<OwnedEventId>, new_room_leaves: Vec<OwnedEventId>,
state_ids_compressed: HashSet<CompressedStateEvent>, state_ids_compressed: Arc<HashSet<CompressedStateEvent>>,
soft_fail: bool, soft_fail: bool,
state_lock: &MutexGuard<'_, ()>, // Take mutex guard to make sure users get the room state mutex state_lock: &MutexGuard<'_, ()>, // Take mutex guard to make sure users get the room state mutex
) -> Result<Option<Vec<u8>>> { ) -> Result<Option<Vec<u8>>> {