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

Use a query that postgresql optimises better for get_events_around

Browse source
This commit is contained in:
Mark Haines 2016-07-04 15:48:25 +01:00
parent 1238203bc4
commit f18d7546c6
1 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
synapse/storage/stream.py
View file

@ -591,25 +591,28 @@ class StreamStore(SQLBaseStore):
query_before = ( query_before = (
"SELECT topological_ordering, stream_ordering, event_id FROM events" "SELECT topological_ordering, stream_ordering, event_id FROM events"
" WHERE room_id = ? AND (topological_ordering < ?" " WHERE room_id = ? AND topological_ordering < ?"
" OR (topological_ordering = ? AND stream_ordering < ?))" " UNION ALL "
" ORDER BY topological_ordering DESC, stream_ordering DESC" " SELECT topological_ordering, stream_ordering, event_id FROM events"
" LIMIT ?" " WHERE room_id = ? AND topological_ordering = ? AND stream_ordering < ?"
" ORDER BY topological_ordering DESC, stream_ordering DESC LIMIT ?"
) )
query_after = ( query_after = (
"SELECT topological_ordering, stream_ordering, event_id FROM events" "SELECT topological_ordering, stream_ordering, event_id FROM events"
" WHERE room_id = ? AND (topological_ordering > ?" " WHERE room_id = ? AND topological_ordering > ?"
" OR (topological_ordering = ? AND stream_ordering > ?))" " UNION ALL"
" ORDER BY topological_ordering ASC, stream_ordering ASC" " SELECT topological_ordering, stream_ordering, event_id FROM events"
" LIMIT ?" " WHERE room_id = ? AND topological_ordering = ? AND stream_ordering > ?"
" ORDER BY topological_ordering ASC, stream_ordering ASC LIMIT ?"
) )
txn.execute( txn.execute(
query_before, query_before,
( (
room_id, topological_ordering, topological_ordering, room_id, topological_ordering,
stream_ordering, before_limit, room_id, topological_ordering, stream_ordering,
before_limit,
) )
) )
@ -630,8 +633,9 @@ class StreamStore(SQLBaseStore):
txn.execute( txn.execute(
query_after, query_after,
( (
room_id, topological_ordering, topological_ordering, room_id, topological_ordering,
stream_ordering, after_limit, room_id, topological_ordering, stream_ordering,
after_limit,
) )
) )