diff options
| author | Erik Johnston <erik@matrix.org> | 2018-03-01 16:26:42 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2018-03-01 16:26:42 +0000 |
| commit | 64346be26de92860b7c2b22edc3ffa740beee3d0 (patch) | |
| tree | dfc78650bd630bb06dcd64e9178f06d2e9fbcd84 /synapse/replication/slave | |
| parent | Remove unused variables (diff) | |
| parent | Merge pull request #2923 from matrix-org/erikj/stream_ago_worker (diff) | |
| download | synapse-64346be26de92860b7c2b22edc3ffa740beee3d0.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_stream_store
Diffstat (limited to 'synapse/replication/slave')
| -rw-r--r-- | synapse/replication/slave/storage/events.py | 2 | ||||
| -rw-r--r-- | synapse/replication/slave/storage/room.py | 21 |
2 files changed, 4 insertions, 19 deletions
diff --git a/synapse/replication/slave/storage/events.py b/synapse/replication/slave/storage/events.py index 517a9f0ec6..ec634c1bf9 100644 --- a/synapse/replication/slave/storage/events.py +++ b/synapse/replication/slave/storage/events.py @@ -53,8 +53,6 @@ class SlavedEventStore(RoomMemberWorkerStore, EventPushActionsWorkerStore, super(SlavedEventStore, self).__init__(db_conn, hs) - self.stream_ordering_month_ago = 0 - # Cached functions can't be accessed through a class instance so we need # to reach inside the __dict__ to extract them. get_latest_event_ids_in_room = EventFederationStore.__dict__[ diff --git a/synapse/replication/slave/storage/room.py b/synapse/replication/slave/storage/room.py index f510384033..5ae1670157 100644 --- a/synapse/replication/slave/storage/room.py +++ b/synapse/replication/slave/storage/room.py @@ -14,32 +14,19 @@ # limitations under the License. from ._base import BaseSlavedStore -from synapse.storage import DataStore -from synapse.storage.room import RoomStore +from synapse.storage.room import RoomWorkerStore from ._slaved_id_tracker import SlavedIdTracker -class RoomStore(BaseSlavedStore): +class RoomStore(RoomWorkerStore, BaseSlavedStore): def __init__(self, db_conn, hs): super(RoomStore, self).__init__(db_conn, hs) self._public_room_id_gen = SlavedIdTracker( db_conn, "public_room_list_stream", "stream_id" ) - get_public_room_ids = DataStore.get_public_room_ids.__func__ - get_current_public_room_stream_id = ( - DataStore.get_current_public_room_stream_id.__func__ - ) - get_public_room_ids_at_stream_id = ( - RoomStore.__dict__["get_public_room_ids_at_stream_id"] - ) - get_public_room_ids_at_stream_id_txn = ( - DataStore.get_public_room_ids_at_stream_id_txn.__func__ - ) - get_published_at_stream_id_txn = ( - DataStore.get_published_at_stream_id_txn.__func__ - ) - get_public_room_changes = DataStore.get_public_room_changes.__func__ + def get_current_public_room_stream_id(self): + return self._public_room_id_gen.get_current_token() def stream_positions(self): result = super(RoomStore, self).stream_positions() |