Deleting from event_push_actions needs to use an index

1 files changed, 8 insertions, 1 deletions

diff --git a/synapse/storage/events.py b/synapse/storage/events.py

index ecb79c07ef..1a0ec5db9b 100644
--- a/synapse/storage/events.py
+++ b/synapse/storage/events.py
@@ -591,7 +591,6 @@ class EventsStore(SQLBaseStore):
                 "event_edge_hashes",
                 "event_edges",
                 "event_forward_extremities",
-                "event_push_actions",
                 "event_reference_hashes",
                 "event_search",
                 "event_signatures",
@@ -610,6 +609,14 @@ class EventsStore(SQLBaseStore):
                     "DELETE FROM %s WHERE event_id = ?" % (table,),
                     [(ev.event_id,) for ev, _ in events_and_contexts]
                 )
+            for table in (
+                "event_push_actions",
+            ):
+                txn.executemany(
+                    "DELETE FROM %s WHERE room_id = ? AND event_id = ?" % (table,),
+                    [(ev.event_id,) for ev, _ in events_and_contexts]
+                )
+
 
         self._simple_insert_many_txn(
             txn,