Correctly changes to required state config in sliding sync #17785
+1,188
−14
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
erikjohnston
force-pushed
the
erikj/ss_required_state
branch
from
8f03752
to
5e66e98
Compare
Comment on lines
+389
to
+390
| for event_type, state_key in db_to_json(row[1]): | ||
| state.setdefault(event_type, set()).add(state_key) |
There was a problem hiding this comment.
Perhaps, whenever we db_to_json(...), we should scrutinize the output. We could add some asserts (or ignore invalid data with logging) to narrow the type to what we expect which gives us better types and we could've caught this earlier.
isinstance(event_type, str)
isinstance(state_key, str)
There was a problem hiding this comment.
Yeah, we could. Though we don't really do it elsewhere and they're covered by tests (and the data types are enforced by the DB).
There was a problem hiding this comment.
Wasn't this a mistake before that wasn't caught by either?
We previously assumed state_keys was a list but was just a single value and would have clobbered any required_state map with multiple state_keys
MadLittleMods
added a commit
to MadLittleMods/synapse
that referenced
this pull request
Oct 8, 2024
This was referenced Oct 8, 2024
Co-authored-by: Eric Eastwood <eric.eastwood@beta.gouv.fr>
MadLittleMods
approved these changes
Oct 10, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #17698
This handles
required_statechanges by checking if new state has been added to the config, and if so fetching and returning that from the current state.This also takes care to ensure that given a state entry S that is added, removed and then re-added that we do not send S down a second time if there have been no changes to S in the current state. This is fine for Rust SDK (as it just remembers all state), but we might decide not to do this behaviour in the MSC. If we decide to always send down S then its easy enough to rip out all the code.