diff options
| author | Erik Johnston <erikj@jki.re> | 2016-09-12 10:41:21 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-12 10:41:21 +0100 |
| commit | caef86f428950ebaaed855cc99ff3d0e1591e147 (patch) | |
| tree | 3ccb304d5fc6817c30e821189e8832721e9abede /synapse/storage/event_push_actions.py | |
| parent | Merge pull request #1101 from matrix-org/erikj/state_types_idx (diff) | |
| parent | Revert "Add index to event_push_actions" (diff) | |
| download | synapse-caef86f428950ebaaed855cc99ff3d0e1591e147.tar.xz | |
Merge pull request #1102 from matrix-org/revert-1099-dbkr/make_notif_highlight_query_fast
Revert "Add index to event_push_actions"
Diffstat (limited to 'synapse/storage/event_push_actions.py')
| -rw-r--r-- | synapse/storage/event_push_actions.py | 4 |
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 ?" |