summary refs log tree commit diff
path: root/synapse/storage/data_stores/main/stream.py
diff options
context:
space:
mode:
authorBrendan Abolivier <babolivier@matrix.org>2019-11-01 11:47:28 +0000
committerBrendan Abolivier <babolivier@matrix.org>2019-11-01 11:47:28 +0000
commita2c63c619ad1116cad07564c055aa6af8943d899 (patch)
tree24d04b2d7e107bbb31fe11f6843cec5426b815b4 /synapse/storage/data_stores/main/stream.py
parentAdd unstable feature flag (diff)
downloadsynapse-a2c63c619ad1116cad07564c055aa6af8943d899.tar.xz
Add more data to the event_labels table and fix the indexes
Diffstat (limited to 'synapse/storage/data_stores/main/stream.py')
-rw-r--r--synapse/storage/data_stores/main/stream.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/storage/data_stores/main/stream.py b/synapse/storage/data_stores/main/stream.py
index cfa34ba1e7..616ef91d4e 100644
--- a/synapse/storage/data_stores/main/stream.py
+++ b/synapse/storage/data_stores/main/stream.py
@@ -874,7 +874,7 @@ class StreamWorkerStore(EventsWorkerStore, SQLBaseStore):
         sql = (
             "SELECT DISTINCT event_id, topological_ordering, stream_ordering"
             " FROM events"
-            " LEFT JOIN event_labels USING (event_id)"
+            " LEFT JOIN event_labels USING (event_id, room_id, topological_ordering)"
             " WHERE outlier = ? AND room_id = ? AND %(bounds)s"
             " ORDER BY topological_ordering %(order)s,"
             " stream_ordering %(order)s LIMIT ?"