Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-05-02 21:04:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

When we see a difference in current state, actually use state conflict resolution algorithm

Browse source
This commit is contained in:
Erik Johnston 2015-02-13 14:20:05 +00:00
parent 6375abcdac
commit 8c652a2b5f
2 changed files with 63 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

43
synapse/state.py
View file

@ -259,13 +259,37 @@ class StateHandler(object):
defer.returnValue((name, state, prev_states))
new_state, prev_states = self._resolve_events(
state_groups.values(), event_type, state_key
)
if self._state_cache is not None:
cache = _StateCacheEntry(
state=new_state,
state_group=None,
ts=self.clock.time_msec()
)
self._state_cache[frozenset(event_ids)] = cache
defer.returnValue((None, new_state, prev_states))
def resolve_events(self, state_sets, event):
if event.is_state():
return self._resolve_events(
state_sets, event.type, event.state_key
)
else:
return self._resolve_events(state_sets)
def _resolve_events(self, state_sets, event_type=None, state_key=""):
state = {}
for group, g_state in state_groups.items():
for s in g_state:
for st in state_sets:
for e in st:
state.setdefault(
(s.type, s.state_key),
(e.type, e.state_key),
{}
)[s.event_id] = s
)[e.event_id] = e
unconflicted_state = {
k: v.values()[0] for k, v in state.items()
@ -302,16 +326,7 @@ class StateHandler(object):
new_state = unconflicted_state
new_state.update(resolved_state)
if self._state_cache is not None:
cache = _StateCacheEntry(
state=new_state,
state_group=None,
ts=self.clock.time_msec()
)
self._state_cache[frozenset(event_ids)] = cache
defer.returnValue((None, new_state, prev_states))
return new_state, prev_states
@log_function
def _resolve_state_events(self, conflicted_state, auth_events):