summary refs log tree commit diff
path: root/synapse/storage/search.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-11-12 14:07:25 +0000
committerErik Johnston <erik@matrix.org>2015-11-12 14:48:39 +0000
commit14a9d805b959b5d2b26fea0d57794cb3ceb28958 (patch)
treea67cfd3d75bfc56ff021a96b0ce67a0595c60248 /synapse/storage/search.py
parentFix bug where assumed dict was namedtuple (diff)
downloadsynapse-14a9d805b959b5d2b26fea0d57794cb3ceb28958.tar.xz
Use a (hopefully) more efficient SQL query for doing recency based room search
Diffstat (limited to 'synapse/storage/search.py')
-rw-r--r--synapse/storage/search.py10
1 files changed, 6 insertions, 4 deletions
diff --git a/synapse/storage/search.py b/synapse/storage/search.py
index 2e88c51ad0..eac265b543 100644
--- a/synapse/storage/search.py
+++ b/synapse/storage/search.py
@@ -253,11 +253,13 @@ class SearchStore(BackgroundUpdateStore):
             )
         elif isinstance(self.database_engine, Sqlite3Engine):
             sql = (
-                "SELECT rank(matchinfo(event_search)) as rank, room_id, event_id,"
+                "SELECT rank(matchinfo) as rank, room_id, event_id,"
                 " topological_ordering, stream_ordering"
-                " FROM event_search"
-                " NATURAL JOIN events"
-                " WHERE value MATCH ? AND room_id = ?"
+                " FROM (SELECT event_id, matchinfo(event_search) FROM event_search"
+                " WHERE value MATCH"
+                " )"
+                " CROSS JOIN events USING (event_id)"
+                " WHERE room_id = ?"
             )
         else:
             # This should be unreachable.