diff options
| author | Mark Haines <mjark@negativecurvature.net> | 2016-04-06 13:21:19 +0100 |
|---|---|---|
| committer | Mark Haines <mjark@negativecurvature.net> | 2016-04-06 13:21:19 +0100 |
| commit | 196ebaf6623c3eb34e2ea9f65652b5cec6ef4bb4 (patch) | |
| tree | 48465a8a5dba436fe884d7f2ac68ab9927afaba1 /synapse/storage | |
| parent | Merge pull request #692 from matrix-org/markjh/replicate_reshuffle (diff) | |
| parent | Make the cache objects be per instance rather than being global (diff) | |
| download | synapse-196ebaf6623c3eb34e2ea9f65652b5cec6ef4bb4.tar.xz | |
Merge pull request #695 from matrix-org/markjh/cachesII
Make the cache objects be per instance rather than being global
Diffstat (limited to 'synapse/storage')
| -rw-r--r-- | synapse/storage/receipts.py | 4 | ||||
| -rw-r--r-- | synapse/storage/registration.py | 2 | ||||
| -rw-r--r-- | synapse/storage/state.py | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/synapse/storage/receipts.py b/synapse/storage/receipts.py index 4befebc8e2..7fdd84bbdc 100644 --- a/synapse/storage/receipts.py +++ b/synapse/storage/receipts.py @@ -160,8 +160,8 @@ class ReceiptsStore(SQLBaseStore): "content": content, }]) - @cachedList(cache=get_linearized_receipts_for_room.cache, list_name="room_ids", - num_args=3, inlineCallbacks=True) + @cachedList(cached_method_name="get_linearized_receipts_for_room", + list_name="room_ids", num_args=3, inlineCallbacks=True) def _get_linearized_receipts_for_rooms(self, room_ids, to_key, from_key=None): if not room_ids: defer.returnValue({}) diff --git a/synapse/storage/registration.py b/synapse/storage/registration.py index d46a963bb8..1f71773aaa 100644 --- a/synapse/storage/registration.py +++ b/synapse/storage/registration.py @@ -319,7 +319,7 @@ class RegistrationStore(SQLBaseStore): defer.returnValue(res if res else False) - @cachedList(cache=is_guest.cache, list_name="user_ids", num_args=1, + @cachedList(cached_method_name="is_guest", list_name="user_ids", num_args=1, inlineCallbacks=True) def are_guests(self, user_ids): sql = "SELECT name, is_guest FROM users WHERE name IN (%s)" % ( diff --git a/synapse/storage/state.py b/synapse/storage/state.py index e9f9406014..c5d2a3a6df 100644 --- a/synapse/storage/state.py +++ b/synapse/storage/state.py @@ -273,8 +273,8 @@ class StateStore(SQLBaseStore): desc="_get_state_group_for_event", ) - @cachedList(cache=_get_state_group_for_event.cache, list_name="event_ids", - num_args=1, inlineCallbacks=True) + @cachedList(cached_method_name="_get_state_group_for_event", + list_name="event_ids", num_args=1, inlineCallbacks=True) def _get_state_group_for_events(self, event_ids): """Returns mapping event_id -> state_group """ |