diff options
| author | Matthew Hodgson <matthew@matrix.org> | 2018-07-24 14:03:37 +0100 |
|---|---|---|
| committer | Matthew Hodgson <matthew@matrix.org> | 2018-07-24 14:03:37 +0100 |
| commit | 454f59b7ad70076865186c7d9e25b75377660a32 (patch) | |
| tree | 949bbdd35ddd587ed4d6c476ce7cd6c7a28752c9 /synapse/storage | |
| parent | clarify comment on p_ids (diff) | |
| parent | Merge pull request #3592 from matrix-org/erikj/speed_up_calculate_state_delta (diff) | |
| download | synapse-454f59b7ad70076865186c7d9e25b75377660a32.tar.xz | |
Merge branch 'develop' into matthew/filter_members
Diffstat (limited to 'synapse/storage')
| -rw-r--r-- | synapse/storage/events.py | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/synapse/storage/events.py b/synapse/storage/events.py index 4d0706f23d..19c05dc8d6 100644 --- a/synapse/storage/events.py +++ b/synapse/storage/events.py @@ -439,8 +439,7 @@ class EventsStore(EventsWorkerStore): delta = yield self._calculate_state_delta( 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( "persist_events", @@ -655,21 +654,14 @@ class EventsStore(EventsWorkerStore): """ 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 = { 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 = { 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)) |