summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorBrendan Abolivier <babolivier@matrix.org>2019-11-08 10:34:09 +0000
committerBrendan Abolivier <babolivier@matrix.org>2019-11-08 10:34:09 +0000
commitb16fa433860824560c64acf594aa6c891e5f1a0a (patch)
treef2fd15925103bc664201f8f4b6c8caa100255973 /synapse
parentLint (diff)
downloadsynapse-b16fa433860824560c64acf594aa6c891e5f1a0a.tar.xz
Incorporate review
Diffstat (limited to 'synapse')
-rw-r--r--synapse/storage/data_stores/main/stream.py24
1 files changed, 12 insertions, 12 deletions
diff --git a/synapse/storage/data_stores/main/stream.py b/synapse/storage/data_stores/main/stream.py
index 90bb2d8e8f..8780fdd989 100644
--- a/synapse/storage/data_stores/main/stream.py
+++ b/synapse/storage/data_stores/main/stream.py
@@ -877,10 +877,10 @@ class StreamWorkerStore(EventsWorkerStore, SQLBaseStore):
             # If we're not filtering on a label, then joining on event_labels will
             # return as many row for a single event as the number of labels it has. To
             # avoid this, only join if we're filtering on at least one label.
-            join_clause = (
-                "LEFT JOIN event_labels"
-                " USING (event_id, room_id, topological_ordering)"
-            )
+            join_clause = """
+                LEFT JOIN event_labels
+                USING (event_id, room_id, topological_ordering)
+            """
             if len(event_filter.labels) > 1:
                 # Using DISTINCT in this SELECT query is quite expensive, because it
                 # requires the engine to sort on the entire (not limited) result set,
@@ -890,14 +890,14 @@ class StreamWorkerStore(EventsWorkerStore, SQLBaseStore):
                 # the results.
                 select_keywords += "DISTINCT"
 
-        sql = (
-            "%(select_keywords)s event_id, topological_ordering, stream_ordering"
-            " FROM events"
-            " %(join_clause)s"
-            " WHERE outlier = ? AND room_id = ? AND %(bounds)s"
-            " ORDER BY topological_ordering %(order)s,"
-            " stream_ordering %(order)s LIMIT ?"
-        ) % {
+        sql = """
+            %(select_keywords)s event_id, topological_ordering, stream_ordering
+            FROM events
+            %(join_clause)s
+            WHERE outlier = ? AND room_id = ? AND %(bounds)s
+            ORDER BY topological_ordering %(order)s,
+            stream_ordering %(order)s LIMIT ?
+        """ % {
             "select_keywords": select_keywords,
             "join_clause": join_clause,
             "bounds": bounds,