MirrorHub/synapse
0
0
Fork 1
mirror of https://mau.dev/maunium/synapse.git synced 2024-11-15 22:42:23 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse source 
Revert "Try to not use as much CPU in the StreamChangeCache"
This commit is contained in:
Matthew Hodgson 2018-06-26 18:09:28 +01:00 committed by GitHub
commit 71ad43a8b5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
changelog.d/3447.misc
View file

6
synapse/util/caches/stream_change_cache.py
View file

@ -78,8 +78,7 @@ class StreamChangeCache(object):
not_known_entities = set(entities) - set(self._entity_to_key) not_known_entities = set(entities) - set(self._entity_to_key)
result = ( result = (
{self._cache[k] for k in self._cache.islice( set(self._cache.values()[self._cache.bisect_right(stream_pos) :])
start=self._cache.bisect_right(stream_pos))}
.intersection(entities) .intersection(entities)
.union(not_known_entities) .union(not_known_entities)
) )
@ -114,8 +113,7 @@ class StreamChangeCache(object):
assert type(stream_pos) is int assert type(stream_pos) is int
if stream_pos >= self._earliest_known_stream_pos: if stream_pos >= self._earliest_known_stream_pos:
return [self._cache[k] for k in self._cache.islice( return self._cache.values()[self._cache.bisect_right(stream_pos) :]
start=self._cache.bisect_right(stream_pos))]
else: else:
return None return None