tileradotorg/synapse
1
0
Fork 0
forked from MirrorHub/synapse
Code Pull requests Activity

Remove redundant room_version checks

Browse source
This commit is contained in:
Erik Johnston 2018-08-20 14:21:12 +01:00
parent e21c368b8b
commit 8dee601054
2 changed files with 4 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
synapse/handlers/federation.py
View file

@ -1814,7 +1814,7 @@ class FederationHandler(BaseHandler):
room_version = yield self.store.get_room_version(event.room_id) room_version = yield self.store.get_room_version(event.room_id)
new_state = yield self.state_handler.resolve_events( new_state = self.state_handler.resolve_events(
room_version, room_version,
[list(local_view.values()), list(remote_view.values())], [list(local_view.values()), list(remote_view.values())],
event event

15
synapse/state/__init__.py
View file

@ -262,14 +262,9 @@ class StateHandler(object):
defer.returnValue(context) defer.returnValue(context)
logger.debug("calling resolve_state_groups from compute_event_context") logger.debug("calling resolve_state_groups from compute_event_context")
if event.type == EventTypes.Create:
room_version = event.content.get("room_version", RoomVersions.V1)
else:
room_version = None
entry = yield self.resolve_state_groups_for_events( entry = yield self.resolve_state_groups_for_events(
event.room_id, [e for e, _ in event.prev_events], event.room_id, [e for e, _ in event.prev_events],
explicit_room_version=room_version,
) )
prev_state_ids = entry.state prev_state_ids = entry.state
@ -337,8 +332,7 @@ class StateHandler(object):
defer.returnValue(context) defer.returnValue(context)
@defer.inlineCallbacks @defer.inlineCallbacks
def resolve_state_groups_for_events(self, room_id, event_ids, def resolve_state_groups_for_events(self, room_id, event_ids):
explicit_room_version=None):
""" Given a list of event_ids this method fetches the state at each """ Given a list of event_ids this method fetches the state at each
event, resolves conflicts between them and returns them. event, resolves conflicts between them and returns them.
@ -378,8 +372,6 @@ class StateHandler(object):
delta_ids=delta_ids, delta_ids=delta_ids,
)) ))
room_version = explicit_room_version
if not room_version:
room_version = yield self.store.get_room_version(room_id) room_version = yield self.store.get_room_version(room_id)
result = yield self._state_resolution_handler.resolve_state_groups( result = yield self._state_resolution_handler.resolve_state_groups(
@ -393,7 +385,6 @@ class StateHandler(object):
ev_ids, get_prev_content=False, check_redacted=False, ev_ids, get_prev_content=False, check_redacted=False,
) )
@defer.inlineCallbacks
def resolve_events(self, room_version, state_sets, event): def resolve_events(self, room_version, state_sets, event):
logger.info( logger.info(
"Resolving state for %s with %d groups", event.room_id, len(state_sets) "Resolving state for %s with %d groups", event.room_id, len(state_sets)
@ -409,8 +400,6 @@ class StateHandler(object):
for ev in st for ev in st
} }
room_version = yield self.store.get_room_version(event.room_id)
with Measure(self.clock, "state._resolve_events"): with Measure(self.clock, "state._resolve_events"):
new_state = resolve_events_with_state_map( new_state = resolve_events_with_state_map(
room_version, state_set_ids, state_map, room_version, state_set_ids, state_map,
@ -420,7 +409,7 @@ class StateHandler(object):
key: state_map[ev_id] for key, ev_id in iteritems(new_state) key: state_map[ev_id] for key, ev_id in iteritems(new_state)
} }
defer.returnValue(new_state) return new_state
class StateResolutionHandler(object): class StateResolutionHandler(object):