diff options
| author | Erik Johnston <erikj@jki.re> | 2016-08-30 10:50:37 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-30 10:50:37 +0100 |
| commit | 55fc17cf4bdc550ece6feb5d4e5bdf10ab452010 (patch) | |
| tree | 16ba7b22e28eedcb4e42043e1487c285fc89546a /synapse/replication | |
| parent | Merge pull request #1050 from matrix-org/erikj/fix_device_sync (diff) | |
| parent | Add to slave store (diff) | |
| download | synapse-55fc17cf4bdc550ece6feb5d4e5bdf10ab452010.tar.xz | |
Merge pull request #1049 from matrix-org/erikj/presence_users_in_room
Use state handler instead of get_users_in_room/get_joined_hosts
Diffstat (limited to 'synapse/replication')
| -rw-r--r-- | synapse/replication/slave/storage/events.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/synapse/replication/slave/storage/events.py b/synapse/replication/slave/storage/events.py index 65e982a0ce..b14ed4d2d8 100644 --- a/synapse/replication/slave/storage/events.py +++ b/synapse/replication/slave/storage/events.py @@ -123,6 +123,11 @@ class SlavedEventStore(BaseSlavedStore): get_state_groups_ids = DataStore.get_state_groups_ids.__func__ get_state_ids_for_event = DataStore.get_state_ids_for_event.__func__ get_state_ids_for_events = DataStore.get_state_ids_for_events.__func__ + get_joined_users_from_context = DataStore.get_joined_users_from_context.__func__ + _get_joined_users_from_context = ( + RoomMemberStore.__dict__["_get_joined_users_from_context"] + ) + get_recent_events_for_room = DataStore.get_recent_events_for_room.__func__ get_room_events_stream_for_rooms = ( DataStore.get_room_events_stream_for_rooms.__func__ @@ -216,7 +221,6 @@ class SlavedEventStore(BaseSlavedStore): self._get_current_state_for_key.invalidate_all() self.get_rooms_for_user.invalidate_all() self.get_users_in_room.invalidate((event.room_id,)) - # self.get_joined_hosts_for_room.invalidate((event.room_id,)) self._invalidate_get_event_cache(event.event_id) @@ -240,7 +244,6 @@ class SlavedEventStore(BaseSlavedStore): if event.type == EventTypes.Member: self.get_rooms_for_user.invalidate((event.state_key,)) - # self.get_joined_hosts_for_room.invalidate((event.room_id,)) self.get_users_in_room.invalidate((event.room_id,)) self._membership_stream_cache.entity_has_changed( event.state_key, event.internal_metadata.stream_ordering |