tileradotorg/synapse
1
0
Fork 0
forked from MirrorHub/synapse
Code Pull requests Activity

Merge branch 'erikj/cache_varargs_interface' of github.com:matrix-org/synapse into erikj/dictionary_cache

Browse source
This commit is contained in:
Erik Johnston 2015-08-10 10:39:22 +01:00
commit e0b6e49466
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
synapse/storage/_base.py
View file

@ -88,8 +88,8 @@ class Cache(object):
"Cache objects can only be accessed from the main thread" "Cache objects can only be accessed from the main thread"
) )
def get(self, keyargs, default=_CacheSentinel): def get(self, key, default=_CacheSentinel):
val = self.cache.get(keyargs, _CacheSentinel) val = self.cache.get(key, _CacheSentinel)
if val is not _CacheSentinel: if val is not _CacheSentinel:
cache_counter.inc_hits(self.name) cache_counter.inc_hits(self.name)
return val return val
@ -101,29 +101,29 @@ class Cache(object):
else: else:
return default return default
def update(self, sequence, keyargs, value): def update(self, sequence, key, value):
self.check_thread() self.check_thread()
if self.sequence == sequence: if self.sequence == sequence:
# Only update the cache if the caches sequence number matches the # Only update the cache if the caches sequence number matches the
# number that the cache had before the SELECT was started (SYN-369) # number that the cache had before the SELECT was started (SYN-369)
self.prefill(keyargs, value) self.prefill(key, value)
def prefill(self, keyargs, value): def prefill(self, key, value):
if self.max_entries is not None: if self.max_entries is not None:
while len(self.cache) >= self.max_entries: while len(self.cache) >= self.max_entries:
self.cache.popitem(last=False) self.cache.popitem(last=False)
self.cache[keyargs] = value self.cache[key] = value
def invalidate(self, keyargs): def invalidate(self, key):
self.check_thread() self.check_thread()
if not isinstance(keyargs, tuple): if not isinstance(key, tuple):
raise ValueError("keyargs must be a tuple.") raise ValueError("keyargs must be a tuple.")
# Increment the sequence number so that any SELECT statements that # Increment the sequence number so that any SELECT statements that
# raced with the INSERT don't update the cache (SYN-369) # raced with the INSERT don't update the cache (SYN-369)
self.sequence += 1 self.sequence += 1
self.cache.pop(keyargs, None) self.cache.pop(key, None)
def invalidate_all(self): def invalidate_all(self):
self.check_thread() self.check_thread()