Mirrors
/
synapse
mirror of https://github.com/element-hq/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #923 from matrix-org/erikj/purge_history 

Various purge_history fixes
This commit is contained in:
Erik Johnston 2016-07-15 13:23:29 +01:00 committed by GitHub
parent bd7c51921d 978fa53cc2
commit a2d288c6a9
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
synapse/storage/__init__.py
View File

@ -92,7 +92,8 @@ class DataStore(RoomMemberStore, RoomStore,
extra_tables=[("local_invites", "stream_id")] extra_tables=[("local_invites", "stream_id")]
) )
self._backfill_id_gen = StreamIdGenerator( self._backfill_id_gen = StreamIdGenerator(
db_conn, "events", "stream_ordering", step=-1 db_conn, "events", "stream_ordering", step=-1,
extra_tables=[("ex_outlier_stream", "event_stream_ordering")]
) )
self._receipts_id_gen = StreamIdGenerator( self._receipts_id_gen = StreamIdGenerator(
db_conn, "receipts_linearized", "stream_id" db_conn, "receipts_linearized", "stream_id"

12
synapse/storage/events.py
View File

@ -1411,11 +1411,21 @@ class EventsStore(SQLBaseStore):
to_delete to_delete
) )
txn.execute(
"SELECT event_id FROM event_backward_extremities WHERE room_id = ?",
(room_id,)
)
cur_back_event_ids = [event_id for event_id, in txn.fetchall()]
# Update backward extremeties # Update backward extremeties
txn.executemany( txn.executemany(
"INSERT INTO event_backward_extremities (room_id, event_id)" "INSERT INTO event_backward_extremities (room_id, event_id)"
" VALUES (?, ?)", " VALUES (?, ?)",
[(room_id, event_id) for event_id, in new_backwards_extrems] [
(room_id, event_id) for event_id, in new_backwards_extrems
if event_id not in cur_back_event_ids
]
) )
txn.executemany( txn.executemany(