New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add v2 state resolution algorithm #4040

Merged
merged 9 commits into from Oct 24, 2018

Conversation

2 participants
@erikjohnston
Copy link
Member

erikjohnston commented Oct 16, 2018

Supersedes #3786

@erikjohnston erikjohnston force-pushed the erikj/states_res_v2_rebase branch from 694efae to 9feea22 Oct 16, 2018

@erikjohnston erikjohnston force-pushed the erikj/states_res_v2_rebase branch from 9feea22 to 387ae19 Oct 16, 2018

@erikjohnston erikjohnston force-pushed the erikj/states_res_v2_rebase branch from 387ae19 to 4a28d3d Oct 16, 2018

@erikjohnston erikjohnston requested a review from matrix-org/synapse-core Oct 16, 2018

@richvdh
Copy link
Member

richvdh left a comment

lgtm other than a few nits.

Yay tests!

@@ -583,7 +581,7 @@ def _make_state_cache_entry(
)


def resolve_events_with_factory(room_version, state_sets, event_map, state_map_factory):
def resolve_events_with_factory(room_version, state_sets, event_map, state_res_store):

This comment has been minimized.

@richvdh

richvdh Oct 23, 2018

Member

can we rename this now?

This comment has been minimized.

@richvdh

richvdh Oct 23, 2018

Member

(and the v2 impl)

state_res_store=StateResolutionStore(self.store),
)

evs = yield self.store.get_events(

This comment has been minimized.

@richvdh

richvdh Oct 23, 2018

Member

this could do with a comment (now that the one at line 393 has gone)

@erikjohnston erikjohnston added this to To Do in Backend Core Team via automation Oct 24, 2018

@erikjohnston erikjohnston moved this from To Do to In Progress: Planned Project Work in Backend Core Team Oct 24, 2018

@erikjohnston

This comment has been minimized.

Copy link
Member

erikjohnston commented Oct 24, 2018

(tests are failing due to #4082)

@erikjohnston erikjohnston merged commit 3904cbf into develop Oct 24, 2018

4 of 6 checks passed

continuous-integration/travis-ci/pr The Travis CI build failed
Details
continuous-integration/travis-ci/push The Travis CI build failed
Details
ci/circleci: sytestpy2merged Your tests passed on CircleCI!
Details
ci/circleci: sytestpy2postgresmerged Your tests passed on CircleCI!
Details
ci/circleci: sytestpy3merged Your tests passed on CircleCI!
Details
ci/circleci: sytestpy3postgresmerged Your tests passed on CircleCI!
Details

Backend Core Team automation moved this from In Progress: Planned Project Work to Done - Operations Oct 24, 2018

@neilisfragile neilisfragile moved this from Done - Operations to Done - Planned Project in Backend Core Team Oct 25, 2018

@erikjohnston erikjohnston deleted the erikj/states_res_v2_rebase branch Dec 12, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment