diff --git a/synapse/storage/_base.py b/synapse/storage/_base.py
index fd275039be..61657d36ed 100644
--- a/synapse/storage/_base.py
+++ b/synapse/storage/_base.py
@@ -39,8 +39,8 @@ transaction_logger = logging.getLogger("synapse.storage.txn")
# * Move this somewhere higher-level, shared;
# * more generic key management
# * export monitoring stats
-# * maximum size; just evict things at random, or consider LRU?
-def cached(orig):
+# * consider other eviction strategies - LRU?
+def cached(max_entries=1000):
""" A method decorator that applies a memoizing cache around the function.
The function is presumed to take one additional argument, which is used as
@@ -50,24 +50,33 @@ def cached(orig):
The wrapped function has an additional member, a callable called
"invalidate". This can be used to remove individual entries from the cache.
"""
- cache = {}
+ def wrap(orig):
+ cache = {}
- @defer.inlineCallbacks
- def wrapped(self, key):
- if key in cache:
- defer.returnValue(cache[key])
+ @defer.inlineCallbacks
+ def wrapped(self, key):
+ if key in cache:
+ defer.returnValue(cache[key])
+
+ ret = yield orig(self, key)
+
+ while len(cache) > max_entries:
+ # TODO(paul): This feels too biased. However, a random index
+ # would be a bit inefficient, walking the list of keys just
+ # to ignore most of them?
+ del cache[cache.keys()[0]]
- ret = yield orig(self, key)
+ cache[key] = ret;
+ defer.returnValue(ret)
- cache[key] = ret;
- defer.returnValue(ret)
+ def invalidate(key):
+ if key in cache:
+ del cache[key]
- def invalidate(key):
- if key in cache:
- del cache[key]
+ wrapped.invalidate = invalidate
+ return wrapped
- wrapped.invalidate = invalidate
- return wrapped
+ return wrap
class LoggingTransaction(object):
diff --git a/synapse/storage/roommember.py b/synapse/storage/roommember.py
index b8fcc1927e..33a832483e 100644
--- a/synapse/storage/roommember.py
+++ b/synapse/storage/roommember.py
@@ -247,7 +247,7 @@ class RoomMemberStore(SQLBaseStore):
results = self._parse_events_txn(txn, rows)
return results
- @cached
+ @cached()
def get_rooms_for_user(self, user_id):
return self.get_rooms_for_user_where_membership_is(
user_id, membership_list=[Membership.JOIN],
|
