char/dendrite
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Tweaks to backfill (#964)

Browse source
This commit is contained in:
Neil Alexander 2020-04-15 14:39:27 +01:00 committed by GitHub
parent 895a72b6ee
commit 7b3edf4622
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
federationapi/routing/backfill.go
View file

@ -93,7 +93,7 @@ func Backfill(
}
var eventJSONs []json.RawMessage
for _, e := range evs {
for _, e := range gomatrixserverlib.ReverseTopologicalOrdering(evs) {
eventJSONs = append(eventJSONs, e.JSON())
}

2
syncapi/storage/postgres/backward_extremities_table.go
View file

@ -60,7 +60,7 @@ const insertBackwardExtremitySQL = "" +
" ON CONFLICT DO NOTHING"
const selectBackwardExtremitiesForRoomSQL = "" +
"SELECT event_id FROM syncapi_backward_extremities WHERE room_id = $1"
"SELECT DISTINCT event_id FROM syncapi_backward_extremities WHERE room_id = $1"
const deleteBackwardExtremitySQL = "" +
"DELETE FROM syncapi_backward_extremities WHERE room_id = $1 AND prev_event_id = $2"

2
syncapi/storage/sqlite3/backward_extremities_table.go
View file

@ -60,7 +60,7 @@ const insertBackwardExtremitySQL = "" +
" ON CONFLICT (room_id, event_id, prev_event_id) DO NOTHING"
const selectBackwardExtremitiesForRoomSQL = "" +
"SELECT event_id FROM syncapi_backward_extremities WHERE room_id = $1"
"SELECT DISTINCT event_id FROM syncapi_backward_extremities WHERE room_id = $1"
const deleteBackwardExtremitySQL = "" +
"DELETE FROM syncapi_backward_extremities WHERE room_id = $1 AND prev_event_id = $2"