summary refs log tree commit diff
path: root/synapse/storage/events.py
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2017-05-08 16:52:39 +0100
committerGitHub <noreply@github.com>2017-05-08 16:52:39 +0100
commit40dcf0d8565bbda22d6a23bd8083151e91c72306 (patch)
tree3501f762884c8a8fa4ea7ff135ff3b2d70d39bc1 /synapse/storage/events.py
parentMerge pull request #2201 from matrix-org/erikj/store_device_cache (diff)
parentExpand docstring a bit (diff)
downloadsynapse-40dcf0d8565bbda22d6a23bd8083151e91c72306.tar.xz
Merge pull request #2203 from matrix-org/erikj/event_cache_hit_ratio
Don't update event cache hit ratio from get_joined_users
Diffstat (limited to 'synapse/storage/events.py')
-rw-r--r--synapse/storage/events.py19
1 files changed, 17 insertions, 2 deletions
diff --git a/synapse/storage/events.py b/synapse/storage/events.py
index 98707d40ee..2ab44ceaa7 100644
--- a/synapse/storage/events.py
+++ b/synapse/storage/events.py
@@ -1343,11 +1343,26 @@ class EventsStore(SQLBaseStore):
     def _invalidate_get_event_cache(self, event_id):
             self._get_event_cache.invalidate((event_id,))
 
-    def _get_events_from_cache(self, events, allow_rejected):
+    def _get_events_from_cache(self, events, allow_rejected, update_metrics=True):
+        """Fetch events from the caches
+
+        Args:
+            events (list(str)): list of event_ids to fetch
+            allow_rejected (bool): Whether to teturn events that were rejected
+            update_metrics (bool): Whether to update the cache hit ratio metrics
+
+        Returns:
+            dict of event_id -> _EventCacheEntry for each event_id in cache. If
+            allow_rejected is `False` then there will still be an entry but it
+            will be `None`
+        """
         event_map = {}
 
         for event_id in events:
-            ret = self._get_event_cache.get((event_id,), None)
+            ret = self._get_event_cache.get(
+                (event_id,), None,
+                update_metrics=update_metrics,
+            )
             if not ret:
                 continue