cachetools 6.1.0__tar.gz → 6.2.0__tar.gz

{cachetools-6.1.0 → cachetools-6.2.0}/CHANGELOG.rst

@@ -1,3 +1,13 @@
+v6.2.0 (2025-08-25)
+===================
+
+- Improve general ``RRCache`` performance by storing cache keys in an
+  additional sequence container.  Note that this will increase memory
+  consumption.
+
+- Add more unit tests.
+
+
 v6.1.0 (2025-06-16)
 ===================
 

{cachetools-6.1.0/src/cachetools.egg-info → cachetools-6.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cachetools
-Version: 6.1.0
+Version: 6.2.0
 Summary: Extensible memoizing collections and decorators
 Home-page: https://github.com/tkem/cachetools/
 Author: Thomas Kemmer

{cachetools-6.1.0 → cachetools-6.2.0}/src/cachetools/__init__.py

@@ -12,7 +12,7 @@ __all__ = (
     "cachedmethod",
 )
 
-__version__ = "6.1.0"
+__version__ = "6.2.0"
 
 import collections
 import collections.abc
@@ -288,16 +288,33 @@ class RRCache(Cache):
     def __init__(self, maxsize, choice=random.choice, getsizeof=None):
         Cache.__init__(self, maxsize, getsizeof)
         self.__choice = choice
+        self.__index = {}
+        self.__keys = []
 
     @property
     def choice(self):
         """The `choice` function used by the cache."""
         return self.__choice
 
+    def __setitem__(self, key, value, cache_setitem=Cache.__setitem__):
+        cache_setitem(self, key, value)
+        if key not in self.__index:
+            self.__index[key] = len(self.__keys)
+            self.__keys.append(key)
+
+    def __delitem__(self, key, cache_delitem=Cache.__delitem__):
+        cache_delitem(self, key)
+        index = self.__index.pop(key)
+        if index != len(self.__keys) - 1:
+            last = self.__keys[-1]
+            self.__keys[index] = last
+            self.__index[last] = index
+        self.__keys.pop()
+
     def popitem(self):
         """Remove and return a random `(key, value)` pair."""
         try:
-            key = self.__choice(list(self))
+            key = self.__choice(self.__keys)
         except IndexError:
             raise KeyError("%s is empty" % type(self).__name__) from None
         else:

{cachetools-6.1.0 → cachetools-6.2.0/src/cachetools.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cachetools
-Version: 6.1.0
+Version: 6.2.0
 Summary: Extensible memoizing collections and decorators
 Home-page: https://github.com/tkem/cachetools/
 Author: Thomas Kemmer

{cachetools-6.1.0 → cachetools-6.2.0}/tests/test_fifo.py

@@ -5,7 +5,7 @@ from cachetools import FIFOCache
 from . import CacheTestMixin
 
 
-class LRUCacheTest(unittest.TestCase, CacheTestMixin):
+class FIFOCacheTest(unittest.TestCase, CacheTestMixin):
     Cache = FIFOCache
 
     def test_fifo(self):
@@ -54,3 +54,15 @@ class LRUCacheTest(unittest.TestCase, CacheTestMixin):
             cache[4] = 4
         self.assertEqual(len(cache), 1)
         self.assertEqual(cache[3], 3)
+
+    def test_fifo_update_existing(self):
+        cache = FIFOCache(maxsize=2)
+
+        cache[1] = 1
+        cache[2] = 2
+        cache[1] = "updated"
+        cache[3] = 3
+
+        self.assertEqual(cache[1], "updated")
+        self.assertIn(3, cache)
+        self.assertNotIn(2, cache)

{cachetools-6.1.0 → cachetools-6.2.0}/tests/test_lfu.py

@@ -52,3 +52,15 @@ class LFUCacheTest(unittest.TestCase, CacheTestMixin):
             cache[4] = 4
         self.assertEqual(len(cache), 1)
         self.assertEqual(cache[3], 3)
+
+    def test_lfu_update_existing(self):
+        cache = LFUCache(maxsize=2)
+
+        cache[1] = 1
+        cache[2] = 2
+        cache[1] = "updated"
+        cache[3] = 3
+
+        self.assertEqual(cache[1], "updated")
+        self.assertIn(3, cache)
+        self.assertNotIn(2, cache)

{cachetools-6.1.0 → cachetools-6.2.0}/tests/test_lru.py

@@ -54,3 +54,15 @@ class LRUCacheTest(unittest.TestCase, CacheTestMixin):
             cache[4] = 4
         self.assertEqual(len(cache), 1)
         self.assertEqual(cache[3], 3)
+
+    def test_lru_update_existing(self):
+        cache = LRUCache(maxsize=2)
+
+        cache[1] = 1
+        cache[2] = 2
+        cache[1] = "updated"
+        cache[3] = 3
+
+        self.assertEqual(cache[1], "updated")
+        self.assertIn(3, cache)
+        self.assertNotIn(2, cache)

cachetools-6.2.0/tests/test_rr.py

@@ -0,0 +1,83 @@
+import random
+import unittest
+
+from cachetools import RRCache
+
+from . import CacheTestMixin
+
+
+class RRCacheTest(unittest.TestCase, CacheTestMixin):
+    Cache = RRCache
+
+    def test_rr(self):
+        cache = RRCache(maxsize=2, choice=min)
+        self.assertEqual(min, cache.choice)
+
+        cache[1] = 1
+        cache[2] = 2
+        cache[3] = 3
+
+        self.assertEqual(2, len(cache))
+        self.assertEqual(2, cache[2])
+        self.assertEqual(3, cache[3])
+        self.assertNotIn(1, cache)
+
+        cache[0] = 0
+        self.assertEqual(2, len(cache))
+        self.assertEqual(0, cache[0])
+        self.assertEqual(3, cache[3])
+        self.assertNotIn(2, cache)
+
+        cache[4] = 4
+        self.assertEqual(2, len(cache))
+        self.assertEqual(3, cache[3])
+        self.assertEqual(4, cache[4])
+        self.assertNotIn(0, cache)
+
+    def test_rr_getsizeof(self):
+        cache = RRCache(maxsize=3, choice=min, getsizeof=lambda x: x)
+
+        cache[1] = 1
+        cache[2] = 2
+
+        self.assertEqual(len(cache), 2)
+        self.assertEqual(cache[1], 1)
+        self.assertEqual(cache[2], 2)
+
+        cache[3] = 3
+
+        self.assertEqual(len(cache), 1)
+        self.assertEqual(cache[3], 3)
+        self.assertNotIn(1, cache)
+        self.assertNotIn(2, cache)
+
+        with self.assertRaises(ValueError):
+            cache[4] = 4
+        self.assertEqual(len(cache), 1)
+        self.assertEqual(cache[3], 3)
+
+    def test_rr_update_existing(self):
+        cache = RRCache(maxsize=2, choice=min)
+
+        cache[1] = 1
+        cache[2] = 2
+        cache[1] = "updated"
+        cache[3] = 3
+
+        self.assertIn(2, cache)
+        self.assertIn(3, cache)
+        self.assertNotIn(1, cache)
+
+    def test_rr_bad_choice(self):
+        def bad_choice(seq):
+            raise ValueError("test error")
+
+        cache = RRCache(maxsize=2, choice=bad_choice)
+        cache[1] = 1
+        cache[2] = 2
+        with self.assertRaises(ValueError):
+            cache[3] = 3
+
+    def test_rr_default_choice(self):
+        cache = RRCache(maxsize=2)
+        self.assertIs(cache.choice, random.choice)

cachetools-6.1.0/tests/test_rr.py

@@ -1,34 +0,0 @@
-import unittest
-
-from cachetools import RRCache
-
-from . import CacheTestMixin
-
-
-class RRCacheTest(unittest.TestCase, CacheTestMixin):
-    Cache = RRCache
-
-    def test_rr(self):
-        cache = RRCache(maxsize=2, choice=min)
-        self.assertEqual(min, cache.choice)
-
-        cache[1] = 1
-        cache[2] = 2
-        cache[3] = 3
-
-        self.assertEqual(2, len(cache))
-        self.assertEqual(2, cache[2])
-        self.assertEqual(3, cache[3])
-        self.assertNotIn(1, cache)
-
-        cache[0] = 0
-        self.assertEqual(2, len(cache))
-        self.assertEqual(0, cache[0])
-        self.assertEqual(3, cache[3])
-        self.assertNotIn(2, cache)
-
-        cache[4] = 4
-        self.assertEqual(2, len(cache))
-        self.assertEqual(3, cache[3])
-        self.assertEqual(4, cache[4])
-        self.assertNotIn(0, cache)