diff options
| author | Erik Johnston <erik@matrix.org> | 2016-09-12 12:37:09 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-09-12 12:37:09 +0100 |
| commit | 7fe42cf9492273c68a4fede9c697c0c2fb6d020b (patch) | |
| tree | 44d1b5bd52c26dfb9e8e0389b6bebe0e2d861ed3 /synapse/storage/event_push_actions.py | |
| parent | Make reindex happen in bg (diff) | |
| parent | Merge pull request #1103 from matrix-org/markjh/comment_on_create_index (diff) | |
| download | synapse-7fe42cf9492273c68a4fede9c697c0c2fb6d020b.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/make_notif_highlight_query_fast
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 40bfe754b5..8632b2f936 100644 --- a/synapse/storage/event_push_actions.py +++ b/synapse/storage/event_push_actions.py @@ -361,14 +361,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 ?" |