Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2024-10-01 11:49:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

Ensure keys to RoomStreamChangeCache are ints

Browse Source
This commit is contained in:
Erik Johnston 2016-01-28 15:55:26 +00:00
parent e1941442d4
commit c23a8c7833
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
synapse/storage/stream.py
View File

@ -199,12 +199,13 @@ class StreamStore(SQLBaseStore):
if from_key == to_key: if from_key == to_key:
defer.returnValue(([], from_key)) defer.returnValue(([], from_key))
has_changed = yield self._events_stream_cache.get_room_has_changed( if from_id:
room_id, from_id has_changed = yield self._events_stream_cache.get_room_has_changed(
) room_id, from_id
)
if not has_changed: if not has_changed:
defer.returnValue(([], from_key)) defer.returnValue(([], from_key))
def f(txn): def f(txn):
if from_id is not None: if from_id is not None:

6
synapse/util/caches/room_change_cache.py
View File

@ -39,6 +39,8 @@ class RoomStreamChangeCache(object):
caches_by_name[self.name] = self._cache caches_by_name[self.name] = self._cache
def get_room_has_changed(self, room_id, key): def get_room_has_changed(self, room_id, key):
assert type(key) is int
if key <= self._earliest_known_key: if key <= self._earliest_known_key:
return True return True
@ -55,6 +57,8 @@ class RoomStreamChangeCache(object):
"""Returns subset of room ids that have had new things since the """Returns subset of room ids that have had new things since the
given key. If the key is too old it will just return the given list. given key. If the key is too old it will just return the given list.
""" """
assert type(key) is int
if key > self._earliest_known_key: if key > self._earliest_known_key:
keys = self._cache.keys() keys = self._cache.keys()
i = keys.bisect_right(key) i = keys.bisect_right(key)
@ -73,6 +77,8 @@ class RoomStreamChangeCache(object):
def room_has_changed(self, room_id, key): def room_has_changed(self, room_id, key):
"""Informs the cache that the room has been changed at the given key. """Informs the cache that the room has been changed at the given key.
""" """
assert type(key) is int
if key > self._earliest_known_key: if key > self._earliest_known_key:
old_key = self._room_to_key.get(room_id, None) old_key = self._room_to_key.get(room_id, None)
if old_key: if old_key: