From 8057489b260a19cdd36b2f4ac5b587565ca7aac0 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@arasphere.net>
Date: Tue, 26 Jun 2018 18:09:01 +0100
Subject: [PATCH] Revert "Try to not use as much CPU in the StreamChangeCache"
---
changelog.d/3447.misc | 0
synapse/util/caches/stream_change_cache.py | 6 ++----
2 files changed, 2 insertions(+), 4 deletions(-)
delete mode 100644 changelog.d/3447.misc
diff --git a/changelog.d/3447.misc b/changelog.d/3447.misc
deleted file mode 100644
index e69de29bb2..0000000000
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
--
GitLab