tileradotorg/synapse
1
0
Fork 0
forked from MirrorHub/synapse
Code Pull requests Activity

Merge pull request #366 from matrix-org/erikj/search_fix_sqlite_faster

Browse source 
Use a (hopefully) more efficient SQL query for doing recency based room search
This commit is contained in:
Erik Johnston 2015-11-12 16:24:32 +00:00
commit 49f1758d74
1 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
synapse/storage/search.py
View file

@ -252,12 +252,23 @@ class SearchStore(BackgroundUpdateStore):
" WHERE vector @@ query AND room_id = ?" " WHERE vector @@ query AND room_id = ?"
) )
elif isinstance(self.database_engine, Sqlite3Engine): elif isinstance(self.database_engine, Sqlite3Engine):
# We use CROSS JOIN here to ensure we use the right indexes.
# https://sqlite.org/optoverview.html#crossjoin
#
# We want to use the full text search index on event_search to
# extract all possible matches first, then lookup those matches
# in the events table to get the topological ordering. We need
# to use the indexes in this order because sqlite refuses to
# MATCH unless it uses the full text search index
sql = ( 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" " topological_ordering, stream_ordering"
" FROM (SELECT key, event_id, matchinfo(event_search) as matchinfo"
" FROM event_search" " FROM event_search"
" NATURAL JOIN events" " WHERE value MATCH ?"
" WHERE value MATCH ? AND room_id = ?" " )"
" CROSS JOIN events USING (event_id)"
" WHERE room_id = ?"
) )
else: else:
# This should be unreachable. # This should be unreachable.