diff options
| author | Erik Johnston <erik@matrix.org> | 2018-03-01 11:39:45 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2018-03-01 14:01:19 +0000 |
| commit | 0c8ba5dd1ce3e5cec201165c50f69aaa5c68c45d (patch) | |
| tree | 3c8bf7356633f1671f531770de4e5641aafd8607 /synapse/replication/slave | |
| parent | Merge pull request #2920 from matrix-org/erikj/retry_send_event (diff) | |
| download | synapse-0c8ba5dd1ce3e5cec201165c50f69aaa5c68c45d.tar.xz | |
Split up RoomStore
Diffstat (limited to 'synapse/replication/slave')
| -rw-r--r-- | synapse/replication/slave/storage/room.py | 21 |
1 files changed, 4 insertions, 17 deletions
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() |