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

Check is_state

This commit is contained in:
Erik Johnston 2018-05-25 12:33:14 +01:00
parent e717693d77
commit 3e927f85df
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
synapse/storage/events.py
View File

@ -1867,6 +1867,7 @@ class EventsStore(EventsWorkerStore):
table="event_edges", table="event_edges",
keyvalues={ keyvalues={
"event_id": event_id, "event_id": event_id,
"is_state": False,
}, },
retcol="prev_event_id", retcol="prev_event_id",
) )
@ -2239,7 +2240,7 @@ class EventsStore(EventsWorkerStore):
"SELECT DISTINCT e.event_id FROM events_to_purge AS e" "SELECT DISTINCT e.event_id FROM events_to_purge AS e"
" INNER JOIN event_edges AS ed ON e.event_id = ed.prev_event_id" " INNER JOIN event_edges AS ed ON e.event_id = ed.prev_event_id"
" LEFT JOIN events_to_purge AS ep2 ON ed.event_id = ep2.event_id" " LEFT JOIN events_to_purge AS ep2 ON ed.event_id = ep2.event_id"
" WHERE ep2.event_id IS NULL", " WHERE ep2.event_id IS NULL AND NOT ed.is_state",
) )
new_backwards_extrems = txn.fetchall() new_backwards_extrems = txn.fetchall()
@ -2276,7 +2277,7 @@ class EventsStore(EventsWorkerStore):
INNER JOIN event_edges AS ed ON e.event_id = ed.prev_event_id INNER JOIN event_edges AS ed ON e.event_id = ed.prev_event_id
INNER JOIN events AS ee ON ee.event_id = ed.event_id INNER JOIN events AS ee ON ee.event_id = ed.event_id
LEFT JOIN events_to_purge AS ep2 ON ed.event_id = ep2.event_id LEFT JOIN events_to_purge AS ep2 ON ed.event_id = ep2.event_id
WHERE ep2.event_id IS NULL WHERE ep2.event_id IS NULL AND NOT ed.is_state
""", """,
) )