Merge pull request #3452 from matrix-org/revert-3451-hawkowl/sorteddict-api

Revert "Try to not use as much CPU in the StreamChangeCache"

2 files changed, 2 insertions, 4 deletions

diff --git a/changelog.d/3447.misc b/changelog.d/3447.misc
deleted file mode 100644

index e69de29bb2..0000000000
--- a/changelog.d/3447.misc
+++ /dev/null
diff --git a/synapse/util/caches/stream_change_cache.py b/synapse/util/caches/stream_change_cache.py

index 0fb8620001..817118e30f 100644
--- a/synapse/util/caches/stream_change_cache.py
+++ b/synapse/util/caches/stream_change_cache.py
@@ -78,8 +78,7 @@ class StreamChangeCache(object):
             not_known_entities = set(entities) - set(self._entity_to_key)
 
             result = (
-                {self._cache[k] for k in self._cache.islice(
-                    start=self._cache.bisect_right(stream_pos))}
+                set(self._cache.values()[self._cache.bisect_right(stream_pos) :])
                 .intersection(entities)
                 .union(not_known_entities)
             )
@@ -114,8 +113,7 @@ class StreamChangeCache(object):
         assert type(stream_pos) is int
 
         if stream_pos >= self._earliest_known_stream_pos:
-            return [self._cache[k] for k in self._cache.islice(
-                start=self._cache.bisect_right(stream_pos))]
+            return self._cache.values()[self._cache.bisect_right(stream_pos) :]
         else:
             return None