diff options
author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2018-06-04 18:18:08 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-06-04 18:18:08 +0100 |
commit | f29b41fde9e5fcd01438fd85b19d0ba8dbd19de2 (patch) | |
tree | dc23ff01c33265ee316a3d096f6f954fef4b053f /synapse/storage/roommember.py | |
parent | Merge pull request #3334 from matrix-org/rav/cache_factor_override (diff) | |
parent | Remove was_forgotten_at (diff) | |
download | synapse-f29b41fde9e5fcd01438fd85b19d0ba8dbd19de2.tar.xz |
Merge pull request #3324 from matrix-org/rav/remove_dead_method
Remove was_forgotten_at
Diffstat (limited to 'synapse/storage/roommember.py')
-rw-r--r-- | synapse/storage/roommember.py | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/synapse/storage/roommember.py b/synapse/storage/roommember.py index 7bfc3d91b5..48a88f755e 100644 --- a/synapse/storage/roommember.py +++ b/synapse/storage/roommember.py @@ -578,7 +578,6 @@ class RoomMemberStore(RoomMemberWorkerStore): ) txn.execute(sql, (user_id, room_id)) - txn.call_after(self.was_forgotten_at.invalidate_all) txn.call_after(self.did_forget.invalidate, (user_id, room_id)) self._invalidate_cache_and_stream( txn, self.who_forgot_in_room, (room_id,) @@ -609,31 +608,6 @@ class RoomMemberStore(RoomMemberWorkerStore): count = yield self.runInteraction("did_forget_membership", f) defer.returnValue(count == 0) - @cachedInlineCallbacks(num_args=3) - def was_forgotten_at(self, user_id, room_id, event_id): - """Returns whether user_id has elected to discard history for room_id at - event_id. - - event_id must be a membership event.""" - def f(txn): - sql = ( - "SELECT" - " forgotten" - " FROM" - " room_memberships" - " WHERE" - " user_id = ?" - " AND" - " room_id = ?" - " AND" - " event_id = ?" - ) - txn.execute(sql, (user_id, room_id, event_id)) - rows = txn.fetchall() - return rows[0][0] - forgot = yield self.runInteraction("did_forget_membership_at", f) - defer.returnValue(forgot == 1) - @defer.inlineCallbacks def _background_add_membership_profile(self, progress, batch_size): target_min_stream_id = progress.get( |