summary refs log tree commit diff
path: root/synapse/storage/event_push_actions.py
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2016-09-12 10:39:55 +0100
committerGitHub <noreply@github.com>2016-09-12 10:39:55 +0100
commit54417999b692a8dd0f8f4edd62598c80835a4212 (patch)
tree3ccb304d5fc6817c30e821189e8832721e9abede /synapse/storage/event_push_actions.py
parentMerge pull request #1101 from matrix-org/erikj/state_types_idx (diff)
downloadsynapse-54417999b692a8dd0f8f4edd62598c80835a4212.tar.xz
Revert "Add index to event_push_actions"
Diffstat (limited to 'synapse/storage/event_push_actions.py')
-rw-r--r--synapse/storage/event_push_actions.py4
1 files changed, 1 insertions, 3 deletions
diff --git a/synapse/storage/event_push_actions.py b/synapse/storage/event_push_actions.py
index a87d90741a..10e9305f7b 100644
--- a/synapse/storage/event_push_actions.py
+++ b/synapse/storage/event_push_actions.py
@@ -353,14 +353,12 @@ class EventPushActionsStore(SQLBaseStore):
                     before_clause += " "
                 before_clause += "AND epa.highlight = 1"
 
-            # NB. This assumes event_ids are globally unique since
-            # it makes the query easier to index
             sql = (
                 "SELECT epa.event_id, epa.room_id,"
                 " epa.stream_ordering, epa.topological_ordering,"
                 " epa.actions, epa.profile_tag, e.received_ts"
                 " FROM event_push_actions epa, events e"
-                " WHERE epa.event_id = e.event_id"
+                " WHERE epa.room_id = e.room_id AND epa.event_id = e.event_id"
                 " AND epa.user_id = ? %s"
                 " ORDER BY epa.stream_ordering DESC"
                 " LIMIT ?"