diff options
| author | Richard van der Hoff <richard@matrix.org> | 2019-03-27 15:18:28 +0000 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2019-03-27 22:07:05 +0000 |
| commit | 1f6d6f918a57183083c2dd1bba6179373102b918 (patch) | |
| tree | 8776165726ad00fd8d57a24c17cc224735a58ea4 /synapse/app | |
| parent | changelog (diff) | |
| download | synapse-1f6d6f918a57183083c2dd1bba6179373102b918.tar.xz | |
Make EventStream rows have a type
... as a precursor to combining it with the CurrentStateDelta stream.
Diffstat (limited to 'synapse/app')
| -rw-r--r-- | synapse/app/synchrotron.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/synapse/app/synchrotron.py b/synapse/app/synchrotron.py index 9163b56d86..5388def28a 100644 --- a/synapse/app/synchrotron.py +++ b/synapse/app/synchrotron.py @@ -48,6 +48,7 @@ from synapse.replication.slave.storage.receipts import SlavedReceiptsStore from synapse.replication.slave.storage.registration import SlavedRegistrationStore from synapse.replication.slave.storage.room import RoomStore from synapse.replication.tcp.client import ReplicationClientHandler +from synapse.replication.tcp.streams.events import EventsStreamEventRow from synapse.rest.client.v1 import events from synapse.rest.client.v1.initial_sync import InitialSyncRestServlet from synapse.rest.client.v1.room import RoomInitialSyncRestServlet @@ -369,7 +370,9 @@ class SyncReplicationHandler(ReplicationClientHandler): # We shouldn't get multiple rows per token for events stream, so # we don't need to optimise this for multiple rows. for row in rows: - event = yield self.store.get_event(row.event_id) + if row.type != EventsStreamEventRow.TypeId: + continue + event = yield self.store.get_event(row.data.event_id) extra_users = () if event.type == EventTypes.Member: extra_users = (event.state_key,) |