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

Use special UPDATE syntax

Browse source
This commit is contained in:
Erik Johnston 2016-04-21 18:01:49 +01:00
parent b57dcb4b51
commit 8fae3d7b1e
2 changed files with 15 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
synapse/storage/schema/delta/31/search_update.py
View file

@ -22,8 +22,8 @@ logger = logging.getLogger(__name__)
ALTER_TABLE = """
ALTER TABLE event_search ADD COLUMN origin_server_ts BIGINT;
ALTER TABLE event_search ADD COLUMN stream_ordering BIGINT;
ALTER TABLE event_search ADD COLUMN origin_server_ts BIGINT DEFAULT 0;
ALTER TABLE event_search ADD COLUMN stream_ordering BIGINT DEFAULT 0;
"""

34
synapse/storage/search.py
View file

@ -169,33 +169,25 @@ class SearchStore(BackgroundUpdateStore):
self.EVENT_SEARCH_ORDER_UPDATE_NAME, progress,
)
INSERT_CLUMP_SIZE = 1000
def reindex_search_txn(txn):
sql = (
"SELECT e.stream_ordering, e.origin_server_ts, event_id FROM events as e"
" INNER JOIN event_search USING (room_id, event_id)"
" WHERE ? <= e.stream_ordering AND e.stream_ordering < ?"
" ORDER BY e.stream_ordering DESC"
events_sql = (
"SELECT stream_ordering, origin_server_ts, event_id FROM events"
" WHERE ? <= stream_ordering AND stream_ordering < ?"
" ORDER BY stream_ordering DESC"
" LIMIT ?"
)
txn.execute(sql, (target_min_stream_id, max_stream_id, batch_size))
rows = txn.fetchall()
if not rows:
return 0
min_stream_id = rows[-1][0]
sql = (
"UPDATE event_search SET stream_ordering = ?, origin_server_ts = ?"
" WHERE event_id = ?"
)
"UPDATE event_search AS es SET es.stream_ordering = e.stream_ordering,"
" es.origin_server_ts = e.origin_server_ts"
" FROM (%s) AS e"
" WHERE e.event_id = es.event_id"
" RETURNING es.stream_ordering"
) % (events_sql,)
for index in range(0, len(rows), INSERT_CLUMP_SIZE):
clump = rows[index:index + INSERT_CLUMP_SIZE]
txn.executemany(sql, clump)
txn.execute(sql, (target_min_stream_id, max_stream_id, batch_size))
rows = txn.fetchall()
min_stream_id = rows[-1][0]
progress = {
"target_min_stream_id_inclusive": target_min_stream_id,