Mirrors
/
synapse
mirror of https://github.com/element-hq/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into matthew/filter_members

This commit is contained in:
Matthew Hodgson 2018-07-24 14:03:37 +01:00
parent 1a01a5b964 0a8e4f3af9
commit 454f59b7ad
2 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/3592.misc Normal file
View File

@ -0,0 +1 @@
Speed up calculating state deltas in persist_event loop

14
synapse/storage/events.py
View File

@ -439,7 +439,6 @@ class EventsStore(EventsWorkerStore):
delta = yield self._calculate_state_delta( delta = yield self._calculate_state_delta(
room_id, current_state, room_id, current_state,
) )
if delta is not None:
state_delta_for_room[room_id] = delta state_delta_for_room[room_id] = delta
yield self.runInteraction( yield self.runInteraction(
@ -655,21 +654,14 @@ class EventsStore(EventsWorkerStore):
""" """
existing_state = yield self.get_current_state_ids(room_id) existing_state = yield self.get_current_state_ids(room_id)
existing_events = set(itervalues(existing_state))
new_events = set(ev_id for ev_id in itervalues(current_state))
changed_events = existing_events ^ new_events
if not changed_events:
return
to_delete = { to_delete = {
key: ev_id for key, ev_id in iteritems(existing_state) key: ev_id for key, ev_id in iteritems(existing_state)
if ev_id in changed_events if ev_id != current_state.get(key)
} }
events_to_insert = (new_events - existing_events)
to_insert = { to_insert = {
key: ev_id for key, ev_id in iteritems(current_state) key: ev_id for key, ev_id in iteritems(current_state)
if ev_id in events_to_insert if ev_id != existing_state.get(key)
} }
defer.returnValue((to_delete, to_insert)) defer.returnValue((to_delete, to_insert))