diff options
| author | Erik Johnston <erik@matrix.org> | 2017-03-13 09:59:54 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2017-03-13 09:59:54 +0000 |
| commit | 672dcf59d3f9da12da43a77e316e2eec76d3ee4c (patch) | |
| tree | 9186644b06ef01e609ca018e02100ceecf0f3ea4 /synapse/storage/events.py | |
| parent | Merge tag 'v0.19.3-rc1' into release-v0.19.3 (diff) | |
| parent | Revert "Support registration & login with phone number" (diff) | |
| download | synapse-672dcf59d3f9da12da43a77e316e2eec76d3ee4c.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.19.3
Diffstat (limited to 'synapse/storage/events.py')
| -rw-r--r-- | synapse/storage/events.py | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/synapse/storage/events.py b/synapse/storage/events.py index c88f689d3a..db01eb6d14 100644 --- a/synapse/storage/events.py +++ b/synapse/storage/events.py @@ -311,6 +311,21 @@ class EventsStore(SQLBaseStore): new_forward_extremeties[room_id] = new_latest_event_ids + len_1 = ( + len(latest_event_ids) == 1 + and len(new_latest_event_ids) == 1 + ) + if len_1: + all_single_prev_not_state = all( + len(event.prev_events) == 1 + and not event.is_state() + for event, ctx in ev_ctx_rm + ) + # Don't bother calculating state if they're just + # a long chain of single ancestor non-state events. + if all_single_prev_not_state: + continue + state = yield self._calculate_state_delta( room_id, ev_ctx_rm, new_latest_event_ids ) |