diff options
| author | Erik Johnston <erikj@jki.re> | 2018-02-23 11:23:23 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-23 11:23:23 +0000 |
| commit | d0957753bf8a68b6824539d33c8444680647f9b4 (patch) | |
| tree | 94db30bb47e628efdf823af02328c61e7b0a2cb9 /synapse/storage/__init__.py | |
| parent | Merge pull request #2897 from matrix-org/erikj/split_account_data (diff) | |
| parent | Update copyright (diff) | |
| download | synapse-d0957753bf8a68b6824539d33c8444680647f9b4.tar.xz | |
Merge pull request #2898 from matrix-org/erikj/split_push_rules_store
Split PushRulesStore
Diffstat (limited to 'synapse/storage/__init__.py')
| -rw-r--r-- | synapse/storage/__init__.py | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/synapse/storage/__init__.py b/synapse/storage/__init__.py index e221284ee2..0f136f8a06 100644 --- a/synapse/storage/__init__.py +++ b/synapse/storage/__init__.py @@ -1,5 +1,6 @@ # -*- coding: utf-8 -*- # Copyright 2014-2016 OpenMarket Ltd +# Copyright 2018 New Vector Ltd # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -169,18 +170,6 @@ class DataStore(RoomMemberStore, RoomStore, prefilled_cache=presence_cache_prefill ) - push_rules_prefill, push_rules_id = self._get_cache_dict( - db_conn, "push_rules_stream", - entity_column="user_id", - stream_column="stream_id", - max_value=self._push_rules_stream_id_gen.get_current_token()[0], - ) - - self.push_rules_stream_cache = StreamChangeCache( - "PushRulesStreamChangeCache", push_rules_id, - prefilled_cache=push_rules_prefill, - ) - max_device_inbox_id = self._device_inbox_id_gen.get_current_token() device_inbox_prefill, min_device_inbox_id = self._get_cache_dict( db_conn, "device_inbox", |