diff options
| author | Erik Johnston <erikj@jki.re> | 2016-09-01 14:20:42 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-01 14:20:42 +0100 |
| commit | 44982606ee7486f970cbfab545e77c10892fd672 (patch) | |
| tree | 91c6ff57c8b781b772044e303450322e101a34c8 /synapse/replication/resource.py | |
| parent | Lower get_linearized_receipts_for_room cache size (diff) | |
| parent | Use state_groups table to test existence (diff) | |
| download | synapse-44982606ee7486f970cbfab545e77c10892fd672.tar.xz | |
Merge pull request #1060 from matrix-org/erikj/state_ids
Assign state groups in state handler.
Diffstat (limited to 'synapse/replication/resource.py')
| -rw-r--r-- | synapse/replication/resource.py | 24 |
1 files changed, 1 insertions, 23 deletions
diff --git a/synapse/replication/resource.py b/synapse/replication/resource.py index 533676814a..1ed9034bcb 100644 --- a/synapse/replication/resource.py +++ b/synapse/replication/resource.py @@ -40,7 +40,6 @@ STREAM_NAMES = ( ("backfill",), ("push_rules",), ("pushers",), - ("state",), ("caches",), ("to_device",), ) @@ -131,7 +130,6 @@ class ReplicationResource(Resource): backfill_token = yield self.store.get_current_backfill_token() push_rules_token, room_stream_token = self.store.get_push_rules_stream_token() pushers_token = self.store.get_pushers_stream_token() - state_token = self.store.get_state_stream_token() caches_token = self.store.get_cache_stream_token() defer.returnValue(_ReplicationToken( @@ -143,7 +141,7 @@ class ReplicationResource(Resource): backfill_token, push_rules_token, pushers_token, - state_token, + 0, # State stream is no longer a thing caches_token, int(stream_token.to_device_key), )) @@ -193,7 +191,6 @@ class ReplicationResource(Resource): yield self.receipts(writer, current_token, limit, request_streams) yield self.push_rules(writer, current_token, limit, request_streams) yield self.pushers(writer, current_token, limit, request_streams) - yield self.state(writer, current_token, limit, request_streams) yield self.caches(writer, current_token, limit, request_streams) yield self.to_device(writer, current_token, limit, request_streams) self.streams(writer, current_token, request_streams) @@ -369,25 +366,6 @@ class ReplicationResource(Resource): )) @defer.inlineCallbacks - def state(self, writer, current_token, limit, request_streams): - current_position = current_token.state - - state = request_streams.get("state") - - if state is not None: - state_groups, state_group_state = ( - yield self.store.get_all_new_state_groups( - state, current_position, limit - ) - ) - writer.write_header_and_rows("state_groups", state_groups, ( - "position", "room_id", "event_id" - )) - writer.write_header_and_rows("state_group_state", state_group_state, ( - "position", "type", "state_key", "event_id" - )) - - @defer.inlineCallbacks def caches(self, writer, current_token, limit, request_streams): current_position = current_token.caches |