Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-12-15 20:18:56 -05:00
Code Issues Projects Releases Packages Wiki Activity

Revert all the bits changing keys of eeverything that used LRUCaches to tuples

Browse source
This commit is contained in:
David Baker 2016-01-22 12:18:14 +00:00
parent 10f76dc5da
commit d552861346
5 changed files with 44 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

26
tests/storage/test__base.py
View file

@ -56,42 +56,42 @@ class CacheTestCase(unittest.TestCase):
def test_eviction(self):
cache = Cache("test", max_entries=2)
cache.prefill((1,), "one")
cache.prefill((2,), "two")
cache.prefill((3,), "three") # 1 will be evicted
cache.prefill(1, "one")
cache.prefill(2, "two")
cache.prefill(3, "three") # 1 will be evicted
failed = False
try:
cache.get((1,))
cache.get(1)
except KeyError:
failed = True
self.assertTrue(failed)
cache.get((2,))
cache.get((3,))
cache.get(2)
cache.get(3)
def test_eviction_lru(self):
cache = Cache("test", max_entries=2, lru=True)
cache.prefill((1,), "one")
cache.prefill((2,), "two")
cache.prefill(1, "one")
cache.prefill(2, "two")
# Now access 1 again, thus causing 2 to be least-recently used
cache.get((1,))
cache.get(1)
cache.prefill((3,), "three")
cache.prefill(3, "three")
failed = False
try:
cache.get((2,))
cache.get(2)
except KeyError:
failed = True
self.assertTrue(failed)
cache.get((1,))
cache.get((3,))
cache.get(1)
cache.get(3)
class CacheDecoratorTestCase(unittest.TestCase):

44
tests/util/test_lrucache.py
View file

@ -22,37 +22,37 @@ from synapse.util.caches.treecache import TreeCache
class LruCacheTestCase(unittest.TestCase):
def test_get_set(self):
cache = LruCache(1, 1)
cache[("key",)] = "value"
self.assertEquals(cache.get(("key",)), "value")
self.assertEquals(cache[("key",)], "value")
cache = LruCache(1)
cache["key"] = "value"
self.assertEquals(cache.get("key"), "value")
self.assertEquals(cache["key"], "value")
def test_eviction(self):
cache = LruCache(2, 1)
cache[(1,)] = 1
cache[(2,)] = 2
cache = LruCache(2)
cache[1] = 1
cache[2] = 2
self.assertEquals(cache.get((1,)), 1)
self.assertEquals(cache.get((2,)), 2)
self.assertEquals(cache.get(1), 1)
self.assertEquals(cache.get(2), 2)
cache[(3,)] = 3
cache[3] = 3
self.assertEquals(cache.get((1,)), None)
self.assertEquals(cache.get((2,)), 2)
self.assertEquals(cache.get((3,)), 3)
self.assertEquals(cache.get(1), None)
self.assertEquals(cache.get(2), 2)
self.assertEquals(cache.get(3), 3)
def test_setdefault(self):
cache = LruCache(1, 1)
self.assertEquals(cache.setdefault(("key",), 1), 1)
self.assertEquals(cache.get(("key",)), 1)
self.assertEquals(cache.setdefault(("key",), 2), 1)
self.assertEquals(cache.get(("key",)), 1)
cache = LruCache(1)
self.assertEquals(cache.setdefault("key", 1), 1)
self.assertEquals(cache.get("key"), 1)
self.assertEquals(cache.setdefault("key", 2), 1)
self.assertEquals(cache.get("key"), 1)
def test_pop(self):
cache = LruCache(1, 1)
cache[("key",)] = 1
self.assertEquals(cache.pop(("key",)), 1)
self.assertEquals(cache.pop(("key",)), None)
cache = LruCache(1)
cache["key"] = 1
self.assertEquals(cache.pop("key"), 1)
self.assertEquals(cache.pop("key"), None)
def test_del_multi(self):
cache = LruCache(4, 2, cache_type=TreeCache)