summary refs log tree commit diff
path: root/synapse/replication
diff options
context:
space:
mode:
authorDavid Baker <dbkr@users.noreply.github.com>2016-06-28 10:12:24 +0100
committerGitHub <noreply@github.com>2016-06-28 10:12:24 +0100
commitdb74dcda5b6e0fea3d80635283bcaea6355f3579 (patch)
tree6d97a0e7ac37e7d5f7c2337e7d4ea2b4efa79132 /synapse/replication
parentremove vector.im from default secondary DS list (diff)
parentMerge remote-tracking branch 'origin/develop' into dbkr/push_room_naming (diff)
downloadsynapse-db74dcda5b6e0fea3d80635283bcaea6355f3579.tar.xz
Merge pull request #894 from matrix-org/dbkr/push_room_naming
Use similar naming we use in email notifs for push
Diffstat (limited to 'synapse/replication')
-rw-r--r--synapse/replication/slave/storage/events.py9
1 files changed, 0 insertions, 9 deletions
diff --git a/synapse/replication/slave/storage/events.py b/synapse/replication/slave/storage/events.py
index 877c68508c..369d839464 100644
--- a/synapse/replication/slave/storage/events.py
+++ b/synapse/replication/slave/storage/events.py
@@ -18,7 +18,6 @@ from ._slaved_id_tracker import SlavedIdTracker
 from synapse.api.constants import EventTypes
 from synapse.events import FrozenEvent
 from synapse.storage import DataStore
-from synapse.storage.room import RoomStore
 from synapse.storage.roommember import RoomMemberStore
 from synapse.storage.event_federation import EventFederationStore
 from synapse.storage.event_push_actions import EventPushActionsStore
@@ -64,7 +63,6 @@ class SlavedEventStore(BaseSlavedStore):
 
     # Cached functions can't be accessed through a class instance so we need
     # to reach inside the __dict__ to extract them.
-    get_room_name_and_aliases = RoomStore.__dict__["get_room_name_and_aliases"]
     get_rooms_for_user = RoomMemberStore.__dict__["get_rooms_for_user"]
     get_users_in_room = RoomMemberStore.__dict__["get_users_in_room"]
     get_latest_event_ids_in_room = EventFederationStore.__dict__[
@@ -202,7 +200,6 @@ class SlavedEventStore(BaseSlavedStore):
             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.get_room_name_and_aliases.invalidate((event.room_id,))
 
         self._invalidate_get_event_cache(event.event_id)
 
@@ -246,9 +243,3 @@ class SlavedEventStore(BaseSlavedStore):
         self._get_current_state_for_key.invalidate((
             event.room_id, event.type, event.state_key
         ))
-
-        if event.type in [EventTypes.Name, EventTypes.Aliases]:
-            self.get_room_name_and_aliases.invalidate(
-                (event.room_id,)
-            )
-            pass