mirror of
https://git.anonymousland.org/anonymousland/synapse.git
synced 2024-09-09 12:52:03 +00:00
Remove redundant room_version checks
This commit is contained in:
parent
e21c368b8b
commit
8dee601054
@ -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
|
||||||
|
@ -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,9 +372,7 @@ class StateHandler(object):
|
|||||||
delta_ids=delta_ids,
|
delta_ids=delta_ids,
|
||||||
))
|
))
|
||||||
|
|
||||||
room_version = explicit_room_version
|
room_version = yield self.store.get_room_version(room_id)
|
||||||
if not room_version:
|
|
||||||
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(
|
||||||
room_id, room_version, state_groups_ids, None,
|
room_id, room_version, state_groups_ids, None,
|
||||||
@ -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):
|
||||||
|
Loading…
Reference in New Issue
Block a user