summary refs log tree commit diff
path: root/synapse/storage
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2018-07-23 17:13:34 +0100
committerRichard van der Hoff <richard@matrix.org>2018-07-23 17:13:34 +0100
commitdae6dc1e776cc6198dc1f71575876fc16693c170 (patch)
treec0d3bddd971c0e2aa003193460a01b849b7c63b7 /synapse/storage
parentMerge pull request #3571 from matrix-org/rav/limiter_fixes (diff)
downloadsynapse-dae6dc1e776cc6198dc1f71575876fc16693c170.tar.xz
Remove redundant checks on room forgottenness
Fixes #3550
Diffstat (limited to 'synapse/storage')
-rw-r--r--synapse/storage/push_rule.py13
-rw-r--r--synapse/storage/roommember.py15
2 files changed, 0 insertions, 28 deletions
diff --git a/synapse/storage/push_rule.py b/synapse/storage/push_rule.py
index be655d287b..d25b39ec02 100644
--- a/synapse/storage/push_rule.py
+++ b/synapse/storage/push_rule.py
@@ -21,7 +21,6 @@ from canonicaljson import json
 
 from twisted.internet import defer
 
-from synapse.api.constants import EventTypes
 from synapse.push.baserules import list_with_base_rules
 from synapse.storage.appservice import ApplicationServiceWorkerStore
 from synapse.storage.pusher import PusherWorkerStore
@@ -247,18 +246,6 @@ class PushRulesWorkerStore(ApplicationServiceWorkerStore,
             if uid in local_users_in_room:
                 user_ids.add(uid)
 
-        forgotten = yield self.who_forgot_in_room(
-            event.room_id, on_invalidate=cache_context.invalidate,
-        )
-
-        for row in forgotten:
-            user_id = row["user_id"]
-            event_id = row["event_id"]
-
-            mem_id = current_state_ids.get((EventTypes.Member, user_id), None)
-            if event_id == mem_id:
-                user_ids.discard(user_id)
-
         rules_by_user = yield self.bulk_get_push_rules(
             user_ids, on_invalidate=cache_context.invalidate,
         )
diff --git a/synapse/storage/roommember.py b/synapse/storage/roommember.py
index 02a802bed9..9eb5b18144 100644
--- a/synapse/storage/roommember.py
+++ b/synapse/storage/roommember.py
@@ -458,18 +458,6 @@ class RoomMemberWorkerStore(EventsWorkerStore):
     def _get_joined_hosts_cache(self, room_id):
         return _JoinedHostsCache(self, room_id)
 
-    @cached()
-    def who_forgot_in_room(self, room_id):
-        return self._simple_select_list(
-            table="room_memberships",
-            retcols=("user_id", "event_id"),
-            keyvalues={
-                "room_id": room_id,
-                "forgotten": 1,
-            },
-            desc="who_forgot"
-        )
-
 
 class RoomMemberStore(RoomMemberWorkerStore):
     def __init__(self, db_conn, hs):
@@ -578,9 +566,6 @@ class RoomMemberStore(RoomMemberWorkerStore):
             txn.execute(sql, (user_id, room_id))
 
             txn.call_after(self.did_forget.invalidate, (user_id, room_id))
-            self._invalidate_cache_and_stream(
-                txn, self.who_forgot_in_room, (room_id,)
-            )
         return self.runInteraction("forget_membership", f)
 
     @cachedInlineCallbacks(num_args=2)