mirror of
https://git.anonymousland.org/anonymousland/synapse.git
synced 2025-05-06 11:24:59 -04:00
Replace DeferredCache with LruCache where possible (#8563)
Most of these uses don't need a full-blown DeferredCache; LruCache is lighter and more appropriate.
This commit is contained in:
parent
79c1f973ce
commit
97647b33c2
8 changed files with 30 additions and 27 deletions
|
@ -19,7 +19,7 @@ from typing import Dict, Optional, Tuple
|
|||
from synapse.metrics.background_process_metrics import wrap_as_background_process
|
||||
from synapse.storage._base import SQLBaseStore
|
||||
from synapse.storage.database import DatabasePool, make_tuple_comparison_clause
|
||||
from synapse.util.caches.deferred_cache import DeferredCache
|
||||
from synapse.util.caches.lrucache import LruCache
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
|
@ -410,8 +410,8 @@ class ClientIpWorkerStore(ClientIpBackgroundUpdateStore):
|
|||
class ClientIpStore(ClientIpWorkerStore):
|
||||
def __init__(self, database: DatabasePool, db_conn, hs):
|
||||
|
||||
self.client_ip_last_seen = DeferredCache(
|
||||
name="client_ip_last_seen", keylen=4, max_entries=50000
|
||||
self.client_ip_last_seen = LruCache(
|
||||
cache_name="client_ip_last_seen", keylen=4, max_size=50000
|
||||
)
|
||||
|
||||
super().__init__(database, db_conn, hs)
|
||||
|
@ -442,7 +442,7 @@ class ClientIpStore(ClientIpWorkerStore):
|
|||
if last_seen is not None and (now - last_seen) < LAST_SEEN_GRANULARITY:
|
||||
return
|
||||
|
||||
self.client_ip_last_seen.prefill(key, now)
|
||||
self.client_ip_last_seen.set(key, now)
|
||||
|
||||
self._batch_row_update[key] = (user_agent, device_id, now)
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue