Merge pull request #543 from matrix-org/erikj/sync

Cache get_room_changes_for_user
This commit is contained in:
Erik Johnston 2016-02-01 15:05:06 +00:00
commit 2d3837bec7
3 changed files with 15 additions and 0 deletions

View File

@ -131,6 +131,10 @@ class DataStore(RoomMemberStore, RoomStore,
prefilled_cache=event_cache_prefill, prefilled_cache=event_cache_prefill,
) )
self._membership_stream_cache = StreamChangeCache(
"MembershipStreamChangeCache", events_max,
)
account_max = self._account_data_id_gen.get_max_token(None) account_max = self._account_data_id_gen.get_max_token(None)
self._account_data_stream_cache = StreamChangeCache( self._account_data_stream_cache = StreamChangeCache(
"AccountDataAndTagsChangeCache", account_max, "AccountDataAndTagsChangeCache", account_max,

View File

@ -58,6 +58,10 @@ class RoomMemberStore(SQLBaseStore):
txn.call_after(self.get_rooms_for_user.invalidate, (event.state_key,)) txn.call_after(self.get_rooms_for_user.invalidate, (event.state_key,))
txn.call_after(self.get_joined_hosts_for_room.invalidate, (event.room_id,)) txn.call_after(self.get_joined_hosts_for_room.invalidate, (event.room_id,))
txn.call_after(self.get_users_in_room.invalidate, (event.room_id,)) txn.call_after(self.get_users_in_room.invalidate, (event.room_id,))
txn.call_after(
self._membership_stream_cache.entity_has_changed,
event.state_key, event.internal_metadata.stream_ordering
)
def get_room_member(self, user_id, room_id): def get_room_member(self, user_id, room_id):
"""Retrieve the current state of a room member. """Retrieve the current state of a room member.

View File

@ -252,6 +252,13 @@ class StreamStore(SQLBaseStore):
if from_key == to_key: if from_key == to_key:
return defer.succeed([]) return defer.succeed([])
if from_id:
has_changed = self._membership_stream_cache.has_entity_changed(
user_id, int(from_id)
)
if not has_changed:
return defer.succeed([])
def f(txn): def f(txn):
if from_id is not None: if from_id is not None:
sql = ( sql = (