review comments

This commit is contained in:
Richard van der Hoff 2020-10-16 16:21:43 +01:00
parent 995cc615a0
commit 6d7b22041d

View File

@ -34,11 +34,16 @@ from synapse.config import cache as cache_config
from synapse.util.caches import CacheMetric, register_cache from synapse.util.caches import CacheMetric, register_cache
from synapse.util.caches.treecache import TreeCache from synapse.util.caches.treecache import TreeCache
T = TypeVar("T") # Function type: the type used for invalidation callbacks
FT = TypeVar("FT", bound=Callable[..., Any]) FT = TypeVar("FT", bound=Callable[..., Any])
# Key and Value type for the cache
KT = TypeVar("KT") KT = TypeVar("KT")
VT = TypeVar("VT") VT = TypeVar("VT")
# a general type var, distinct from either KT or VT
T = TypeVar("T")
def enumerate_leaves(node, depth): def enumerate_leaves(node, depth):
if depth == 0: if depth == 0:
@ -227,7 +232,7 @@ class LruCache(Generic[KT, VT]):
@synchronized @synchronized
def cache_get( def cache_get(
key: KT, key: KT,
default=None, default: Optional[T] = None,
callbacks: Iterable[Callable[[], None]] = [], callbacks: Iterable[Callable[[], None]] = [],
update_metrics: bool = True, update_metrics: bool = True,
): ):
@ -291,7 +296,7 @@ class LruCache(Generic[KT, VT]):
... ...
@synchronized @synchronized
def cache_pop(key: KT, default=None): def cache_pop(key: KT, default: Optional[T] = None):
node = cache.get(key, None) node = cache.get(key, None)
if node: if node:
delete_node(node) delete_node(node)