diff options
| author | Matthew Hodgson <matthew@arasphere.net> | 2018-06-26 17:49:55 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-26 17:49:55 +0100 |
| commit | d91efb06cfd2b2c9ce37f364c4ff1d349b81707b (patch) | |
| tree | d3a43daf7d0216050278fad2149127fc890ebcc3 | |
| parent | Merge pull request #3449 from matrix-org/dbkr/fix_deactivate_account_multiple... (diff) | |
| parent | fixes (diff) | |
| download | synapse-d91efb06cfd2b2c9ce37f364c4ff1d349b81707b.tar.xz | |
Merge pull request #3451 from matrix-org/hawkowl/sorteddict-api
Try to not use as much CPU in the cache
| -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 |