Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2024-12-27 05:39:23 -05:00
Code Issues Packages Projects Releases Wiki Activity

Flatten _get_new_state_after_events

Browse Source 
rejig the if statements to simplify the logic and reduce indentation
This commit is contained in:
Richard van der Hoff 2018-01-30 10:17:55 +00:00
parent 9fcbbe8e7d
commit 225dc3b4cb
1 changed files with 47 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
synapse/storage/events.py
View File

@ -503,6 +503,10 @@ class EventsStore(SQLBaseStore):
None if there are no changes to the room state, or None if there are no changes to the room state, or
a dict of (type, state_key) -> event_id]. a dict of (type, state_key) -> event_id].
""" """
if not new_latest_event_ids:
defer.returnValue({})
state_sets = [] state_sets = []
state_groups = set() state_groups = set()
missing_event_ids = [] missing_event_ids = []
@ -537,6 +541,9 @@ class EventsStore(SQLBaseStore):
was_updated = True was_updated = True
missing_event_ids.append(event_id) missing_event_ids.append(event_id)
if not was_updated:
return
if missing_event_ids: if missing_event_ids:
# Now pull out the state for any missing events from DB # Now pull out the state for any missing events from DB
event_to_groups = yield self._get_state_group_for_events( event_to_groups = yield self._get_state_group_for_events(
@ -549,54 +556,49 @@ class EventsStore(SQLBaseStore):
group_to_state = yield self._get_state_for_groups(groups) group_to_state = yield self._get_state_for_groups(groups)
state_sets.extend(group_to_state.itervalues()) state_sets.extend(group_to_state.itervalues())
if not new_latest_event_ids: if len(state_sets) == 1:
defer.returnValue({}) # If there is only one state set, then we know what the current
elif was_updated: # state is.
if len(state_sets) == 1: defer.returnValue(state_sets[0])
# If there is only one state set, then we know what the current
# state is.
defer.returnValue(state_sets[0])
else:
# We work out the current state by passing the state sets to the
# state resolution algorithm. It may ask for some events, including
# the events we have yet to persist, so we need a slightly more
# complicated event lookup function than simply looking the events
# up in the db.
logger.info( # We work out the current state by passing the state sets to the
"Resolving state with %i state sets", len(state_sets), # state resolution algorithm. It may ask for some events, including
# the events we have yet to persist, so we need a slightly more
# complicated event lookup function than simply looking the events
# up in the db.
logger.info(
"Resolving state with %i state sets", len(state_sets),
)
events_map = {ev.event_id: ev for ev, _ in events_context}
@defer.inlineCallbacks
def get_events(ev_ids):
# We get the events by first looking at the list of events we
# are trying to persist, and then fetching the rest from the DB.
db = []
to_return = {}
for ev_id in ev_ids:
ev = events_map.get(ev_id, None)
if ev:
to_return[ev_id] = ev
else:
db.append(ev_id)
if db:
evs = yield self.get_events(
ev_ids, get_prev_content=False, check_redacted=False,
) )
to_return.update(evs)
defer.returnValue(to_return)
events_map = {ev.event_id: ev for ev, _ in events_context} current_state = yield resolve_events_with_factory(
state_sets,
@defer.inlineCallbacks event_map={},
def get_events(ev_ids): state_map_factory=get_events,
# We get the events by first looking at the list of events we )
# are trying to persist, and then fetching the rest from the DB. defer.returnValue(current_state)
db = []
to_return = {}
for ev_id in ev_ids:
ev = events_map.get(ev_id, None)
if ev:
to_return[ev_id] = ev
else:
db.append(ev_id)
if db:
evs = yield self.get_events(
ev_ids, get_prev_content=False, check_redacted=False,
)
to_return.update(evs)
defer.returnValue(to_return)
current_state = yield resolve_events_with_factory(
state_sets,
event_map={},
state_map_factory=get_events,
)
defer.returnValue(current_state)
else:
return
@defer.inlineCallbacks @defer.inlineCallbacks
def _calculate_state_delta(self, room_id, current_state): def _calculate_state_delta(self, room_id, current_state):