diff options
| author | Amber Brown <hawkowl@atleastfornow.net> | 2018-06-28 11:04:18 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-28 11:04:18 +0100 |
| commit | 72d2143ea8fe43464b1db59936acef53293b1b2a (patch) | |
| tree | 06a27dc808cb5696e953671a13910fade4881b4e | |
| parent | Better testing framework for homeserver-using things (#3446) (diff) | |
| download | synapse-72d2143ea8fe43464b1db59936acef53293b1b2a.tar.xz | |
Revert "Revert "Try to not use as much CPU in the StreamChangeCache"" (#3454)
| -rw-r--r-- | changelog.d/3447.misc | 0 | ||||
| -rw-r--r-- | synapse/util/caches/stream_change_cache.py | 6 |
2 files changed, 4 insertions, 2 deletions
diff --git a/changelog.d/3447.misc b/changelog.d/3447.misc new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/changelog.d/3447.misc diff --git a/synapse/util/caches/stream_change_cache.py b/synapse/util/caches/stream_change_cache.py index 817118e30f..0fb8620001 100644 --- a/synapse/util/caches/stream_change_cache.py +++ b/synapse/util/caches/stream_change_cache.py @@ -78,7 +78,8 @@ class StreamChangeCache(object): not_known_entities = set(entities) - set(self._entity_to_key) result = ( - set(self._cache.values()[self._cache.bisect_right(stream_pos) :]) + {self._cache[k] for k in self._cache.islice( + start=self._cache.bisect_right(stream_pos))} .intersection(entities) .union(not_known_entities) ) @@ -113,7 +114,8 @@ class StreamChangeCache(object): assert type(stream_pos) is int if stream_pos >= self._earliest_known_stream_pos: - return self._cache.values()[self._cache.bisect_right(stream_pos) :] + return [self._cache[k] for k in self._cache.islice( + start=self._cache.bisect_right(stream_pos))] else: return None |