From 278d21b5e498e301a43a217595ce75ed7729256f Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Wed, 14 Feb 2018 15:44:51 +0000
Subject: [PATCH] purge_history: fix index use

event_push_actions doesn't have an index on event_id, so we need to specify
room_id.
---
 synapse/storage/events.py | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/synapse/storage/events.py b/synapse/storage/events.py
index 5a2e6a03d5..c81bc75eae 100644
--- a/synapse/storage/events.py
+++ b/synapse/storage/events.py
@@ -2314,6 +2314,20 @@ class EventsStore(SQLBaseStore):
                 ")" % (table,),
             )
 
+        # event_push_actions lacks an index on event_id, and has one on
+        # (room_id, event_id) instead.
+        for table in (
+            "event_push_actions",
+        ):
+            logger.info("[purge] removing events from %s", table)
+
+            txn.execute(
+                "DELETE FROM %s WHERE room_id = ? AND event_id IN ("
+                "    SELECT event_id FROM events_to_purge WHERE should_delete"
+                ")" % (table,),
+                (room_id, )
+            )
+
         # Mark all state and own events as outliers
         logger.info("[purge] marking remaining events as outliers")
         txn.execute(