diff options
| author | Erik Johnston <erikj@jki.re> | 2018-02-23 11:23:11 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-23 11:23:11 +0000 |
| commit | 199dba6c158248b45d2d6244dee2417d9f164d37 (patch) | |
| tree | a12a226c77debc994f44de218f9a8d6a3c9c5143 /synapse/storage/__init__.py | |
| parent | Merge pull request #2893 from matrix-org/erikj/delete_from_staging_fed (diff) | |
| parent | Update copyright (diff) | |
| download | synapse-199dba6c158248b45d2d6244dee2417d9f164d37.tar.xz | |
Merge pull request #2897 from matrix-org/erikj/split_account_data
Split AccountDataStore and TagStore
Diffstat (limited to 'synapse/storage/__init__.py')
| -rw-r--r-- | synapse/storage/__init__.py | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/synapse/storage/__init__.py b/synapse/storage/__init__.py index e1c4fe086e..e221284ee2 100644 --- a/synapse/storage/__init__.py +++ b/synapse/storage/__init__.py @@ -104,9 +104,6 @@ class DataStore(RoomMemberStore, RoomStore, db_conn, "events", "stream_ordering", step=-1, extra_tables=[("ex_outlier_stream", "event_stream_ordering")] ) - self._account_data_id_gen = StreamIdGenerator( - db_conn, "account_data_max_stream_id", "stream_id" - ) self._presence_id_gen = StreamIdGenerator( db_conn, "presence_stream", "stream_id" ) @@ -159,11 +156,6 @@ class DataStore(RoomMemberStore, RoomStore, "MembershipStreamChangeCache", events_max, ) - account_max = self._account_data_id_gen.get_current_token() - self._account_data_stream_cache = StreamChangeCache( - "AccountDataAndTagsChangeCache", account_max, - ) - self._presence_on_startup = self._get_active_presence(db_conn) presence_cache_prefill, min_presence_val = self._get_cache_dict( |