[Core] Add generic typing to LRUCache (#3511)

This commit is contained in:
Nick Hill
2024-03-20 00:36:09 -07:00
committed by GitHub
parent 9474e89ba4
commit 4ad521d8b5
4 changed files with 29 additions and 22 deletions
+11 -9
View File
@@ -5,7 +5,7 @@ import subprocess
import uuid
import gc
from platform import uname
from typing import List, Tuple, Union
from typing import List, Tuple, Union, Generic
from packaging.version import parse, Version
import psutil
@@ -53,10 +53,10 @@ class Counter:
self.counter = 0
class LRUCache:
class LRUCache(Generic[T]):
def __init__(self, capacity: int):
self.cache = OrderedDict()
self.cache = OrderedDict[Hashable, T]()
self.capacity = capacity
def __contains__(self, key: Hashable) -> bool:
@@ -65,10 +65,10 @@ class LRUCache:
def __len__(self) -> int:
return len(self.cache)
def __getitem__(self, key: Hashable) -> Any:
def __getitem__(self, key: Hashable) -> T:
return self.get(key)
def __setitem__(self, key: Hashable, value: Any) -> None:
def __setitem__(self, key: Hashable, value: T) -> None:
self.put(key, value)
def __delitem__(self, key: Hashable) -> None:
@@ -77,7 +77,9 @@ class LRUCache:
def touch(self, key: Hashable) -> None:
self.cache.move_to_end(key)
def get(self, key: Hashable, default_value: Optional[Any] = None) -> int:
def get(self,
key: Hashable,
default_value: Optional[T] = None) -> Optional[T]:
if key in self.cache:
value = self.cache[key]
self.cache.move_to_end(key)
@@ -85,12 +87,12 @@ class LRUCache:
value = default_value
return value
def put(self, key: Hashable, value: Any) -> None:
def put(self, key: Hashable, value: T) -> None:
self.cache[key] = value
self.cache.move_to_end(key)
self._remove_old_if_needed()
def _on_remove(self, key: Hashable, value: Any):
def _on_remove(self, key: Hashable, value: T):
pass
def remove_oldest(self):
@@ -103,7 +105,7 @@ class LRUCache:
while len(self.cache) > self.capacity:
self.remove_oldest()
def pop(self, key: int, default_value: Optional[Any] = None) -> Any:
def pop(self, key: Hashable, default_value: Optional[Any] = None) -> T:
run_on_remove = key in self.cache
value = self.cache.pop(key, default_value)
if run_on_remove: