Content-Length: 6775 | pFad | http://github.com/optimizely/python-sdk/pull/454.patch

thub.com From 72bd026dae799e4dcc3945ba9eaed73d7886416a Mon Sep 17 00:00:00 2001 From: FarhanAnjum-opti Date: Mon, 19 May 2025 20:04:10 +0600 Subject: [PATCH 1/3] Add remove method and tests in LRUCache for cmab service --- optimizely/odp/lru_cache.py | 8 ++++ tests/test_lru_cache.py | 81 +++++++++++++++++++++++++++++++++++++ 2 files changed, 89 insertions(+) diff --git a/optimizely/odp/lru_cache.py b/optimizely/odp/lru_cache.py index e7fc32afe..26b45d446 100644 --- a/optimizely/odp/lru_cache.py +++ b/optimizely/odp/lru_cache.py @@ -91,6 +91,14 @@ def peek(self, key: K) -> Optional[V]: element = self.map.get(key) return element.value if element is not None else None + def remove(self, key: K) -> None: + """Remove the element associated with the provided key from the cache.""" + if self.capacity <= 0: + return + + with self.lock: + self.map.pop(key, None) + @dataclass class CacheElement(Generic[V]): diff --git a/tests/test_lru_cache.py b/tests/test_lru_cache.py index cc4dfdb19..9c24140ee 100644 --- a/tests/test_lru_cache.py +++ b/tests/test_lru_cache.py @@ -130,6 +130,87 @@ def test_reset(self): cache.save('cow', 'crate') self.assertEqual(cache.lookup('cow'), 'crate') + def test_remove_non_existent_key(self): + cache = LRUCache(3, 1000) + cache.save("1", 100) + cache.save("2", 200) + + cache.remove("3") # Doesn't exist + + self.assertEqual(cache.lookup("1"), 100) + self.assertEqual(cache.lookup("2"), 200) + self.assertEqual(len(cache.map), 2) + + def test_remove_existing_key(self): + cache = LRUCache(3, 1000) + + cache.save("1", 100) + cache.save("2", 200) + cache.save("3", 300) + + self.assertEqual(cache.lookup("1"), 100) + self.assertEqual(cache.lookup("2"), 200) + self.assertEqual(cache.lookup("3"), 300) + self.assertEqual(len(cache.map), 3) + + cache.remove("2") + + self.assertEqual(cache.lookup("1"), 100) + self.assertIsNone(cache.lookup("2")) + self.assertEqual(cache.lookup("3"), 300) + self.assertEqual(len(cache.map), 2) + + def test_remove_from_zero_sized_cache(self): + cache = LRUCache(0, 1000) + cache.save("1", 100) + cache.remove("1") + + self.assertIsNone(cache.lookup("1")) + self.assertEqual(len(cache.map), 0) + + def test_remove_and_add_back(self): + cache = LRUCache(3, 1000) + cache.save("1", 100) + cache.save("2", 200) + cache.save("3", 300) + + cache.remove("2") + cache.save("2", 201) + + self.assertEqual(cache.lookup("1"), 100) + self.assertEqual(cache.lookup("2"), 201) + self.assertEqual(cache.lookup("3"), 300) + self.assertEqual(len(cache.map), 3) + + def test_thread_safety(self): + import threading + + max_size = 100 + cache = LRUCache(max_size, 1000) + + for i in range(1, max_size + 1): + cache.save(str(i), i * 100) + + def remove_key(k): + cache.remove(str(k)) + + threads = [] + for i in range(1, (max_size // 2) + 1): + thread = threading.Thread(target=remove_key, args=(i,)) + threads.append(thread) + thread.start() + + for thread in threads: + thread.join() + + for i in range(1, max_size + 1): + if i <= max_size // 2: + self.assertIsNone(cache.lookup(str(i))) + else: + self.assertEqual(cache.lookup(str(i)), i * 100) + + self.assertEqual(len(cache.map), max_size // 2) + # type checker test # confirm that LRUCache matches OptimizelySegmentsCache protocol _: OptimizelySegmentsCache = LRUCache(0, 0) From c0869e8c35b23ef54b4924545d5ada4aeb8af9e8 Mon Sep 17 00:00:00 2001 From: FarhanAnjum-opti Date: Mon, 19 May 2025 22:24:29 +0600 Subject: [PATCH 2/3] refactor: simplify remove method in LRUCache and update related tests --- optimizely/odp/lru_cache.py | 3 --- tests/test_lru_cache.py | 4 ---- 2 files changed, 7 deletions(-) diff --git a/optimizely/odp/lru_cache.py b/optimizely/odp/lru_cache.py index 26b45d446..073973e64 100644 --- a/optimizely/odp/lru_cache.py +++ b/optimizely/odp/lru_cache.py @@ -93,9 +93,6 @@ def peek(self, key: K) -> Optional[V]: def remove(self, key: K) -> None: """Remove the element associated with the provided key from the cache.""" - if self.capacity <= 0: - return - with self.lock: self.map.pop(key, None) diff --git a/tests/test_lru_cache.py b/tests/test_lru_cache.py index 9c24140ee..eeed82009 100644 --- a/tests/test_lru_cache.py +++ b/tests/test_lru_cache.py @@ -139,7 +139,6 @@ def test_remove_non_existent_key(self): self.assertEqual(cache.lookup("1"), 100) self.assertEqual(cache.lookup("2"), 200) - self.assertEqual(len(cache.map), 2) def test_remove_existing_key(self): cache = LRUCache(3, 1000) @@ -151,14 +150,12 @@ def test_remove_existing_key(self): self.assertEqual(cache.lookup("1"), 100) self.assertEqual(cache.lookup("2"), 200) self.assertEqual(cache.lookup("3"), 300) - self.assertEqual(len(cache.map), 3) cache.remove("2") self.assertEqual(cache.lookup("1"), 100) self.assertIsNone(cache.lookup("2")) self.assertEqual(cache.lookup("3"), 300) - self.assertEqual(len(cache.map), 2) def test_remove_from_zero_sized_cache(self): cache = LRUCache(0, 1000) @@ -180,7 +177,6 @@ def test_remove_and_add_back(self): self.assertEqual(cache.lookup("1"), 100) self.assertEqual(cache.lookup("2"), 201) self.assertEqual(cache.lookup("3"), 300) - self.assertEqual(len(cache.map), 3) def test_thread_safety(self): import threading From 6649d6442c7c08c18f3dffc12d43018974b18d88 Mon Sep 17 00:00:00 2001 From: FarhanAnjum-opti Date: Mon, 19 May 2025 22:29:58 +0600 Subject: [PATCH 3/3] refactor: remove redundant assertion in test_remove_existing_key --- tests/test_lru_cache.py | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/test_lru_cache.py b/tests/test_lru_cache.py index eeed82009..b30617b31 100644 --- a/tests/test_lru_cache.py +++ b/tests/test_lru_cache.py @@ -163,7 +163,6 @@ def test_remove_from_zero_sized_cache(self): cache.remove("1") self.assertIsNone(cache.lookup("1")) - self.assertEqual(len(cache.map), 0) def test_remove_and_add_back(self): cache = LRUCache(3, 1000)

pFad - (p)hone/(F)rame/(a)nonymizer/(d)eclutterfier! Saves Data!