mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2026-01-03 12:13:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

Use To in worst case

Browse source
This commit is contained in:
Neil Alexander 2022-03-25 11:57:41 +00:00
parent e28760907d
commit 3df6523a32
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
1 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
syncapi/streams/stream_pdu.go
View file

@ -220,24 +220,19 @@ func (p *PDUStreamProvider) addRoomDeltaToResponse(
return r.From, err return r.From, err
} }
// If we didn't return any events at all then don't bother advancing the stream position.
if len(recentEvents) == 0 && len(delta.StateEvents) == 0 {
return r.From, nil
}
// Sort the events so that we can pick out the latest events from both sections. // Sort the events so that we can pick out the latest events from both sections.
recentEvents = gomatrixserverlib.HeaderedReverseTopologicalOrdering(recentEvents, gomatrixserverlib.TopologicalOrderByPrevEvents) recentEvents = gomatrixserverlib.HeaderedReverseTopologicalOrdering(recentEvents, gomatrixserverlib.TopologicalOrderByPrevEvents)
delta.StateEvents = gomatrixserverlib.HeaderedReverseTopologicalOrdering(delta.StateEvents, gomatrixserverlib.TopologicalOrderByAuthEvents) delta.StateEvents = gomatrixserverlib.HeaderedReverseTopologicalOrdering(delta.StateEvents, gomatrixserverlib.TopologicalOrderByAuthEvents)
// Work out what the highest stream position is for all of the events in this // Work out what the highest stream position is for all of the events in this
// room that were returned. // room that were returned.
latestPosition := r.From latestPosition := r.To
updateLatestPosition := func(mostRecentEventID string) { updateLatestPosition := func(mostRecentEventID string) {
if _, pos, err := p.DB.PositionInTopology(ctx, mostRecentEventID); err == nil { if _, pos, err := p.DB.PositionInTopology(ctx, mostRecentEventID); err == nil {
switch { switch {
case r.Backwards && pos < latestPosition: case r.Backwards && pos > latestPosition:
fallthrough fallthrough
case !r.Backwards && pos > latestPosition: case !r.Backwards && pos < latestPosition:
latestPosition = pos latestPosition = pos
} }
} }