summary refs log tree commit diff
path: root/synapse/storage/events.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2017-05-03 09:56:05 +0100
committerErik Johnston <erik@matrix.org>2017-05-03 09:56:05 +0100
commit1827057acc2b8f821ec20538cbf781f798e34700 (patch)
treee7ff398712beee50c36edb2f5940740e2cc0f849 /synapse/storage/events.py
parentMerge branch 'develop' of github.com:matrix-org/synapse into erikj/prefill_state (diff)
downloadsynapse-1827057acc2b8f821ec20538cbf781f798e34700.tar.xz
Comments
Diffstat (limited to 'synapse/storage/events.py')
-rw-r--r--synapse/storage/events.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/synapse/storage/events.py b/synapse/storage/events.py

index a37b7bad5a..d946024c9b 100644 --- a/synapse/storage/events.py +++ b/synapse/storage/events.py
@@ -441,10 +441,10 @@ class EventsStore(SQLBaseStore): Assumes that we are only persisting events for one room at a time. Returns: - 2-tuple (to_delete, to_insert) where both are state dicts, i.e. - (type, state_key) -> event_id. `to_delete` are the entries to + 3-tuple (to_delete, to_insert, new_state) where both are state dicts, + i.e. (type, state_key) -> event_id. `to_delete` are the entries to first be deleted from current_state_events, `to_insert` are entries - to insert. + to insert. `new_state` is the full set of state. May return None if there are no changes to be applied. """ # Now we need to work out the different state sets for