Mirrors/dendrite
2
0
Fork 0
mirror of https://github.com/matrix-org/dendrite synced 2024-11-10 07:04:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

Re-slice correctly AFTER sorting

Browse source
This commit is contained in:
Till Faelligen 2023-01-03 20:00:19 +01:00
parent 2f809137c9
commit 2b713fe761
No known key found for this signature in database
GPG key ID: 3DF82D8AB9211D4E
1 changed files with 19 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
syncapi/storage/postgres/output_room_events_table.go
View file

@ -23,12 +23,13 @@ import (
"sort"
"github.com/lib/pq"
"github.com/matrix-org/gomatrixserverlib"
"github.com/matrix-org/dendrite/internal"
"github.com/matrix-org/dendrite/roomserver/api"
"github.com/matrix-org/dendrite/syncapi/storage/postgres/deltas"
"github.com/matrix-org/dendrite/syncapi/storage/tables"
"github.com/matrix-org/dendrite/syncapi/types"
"github.com/matrix-org/gomatrixserverlib"
"github.com/matrix-org/dendrite/internal/sqlutil"
)
@ -467,26 +468,32 @@ func (s *outputRoomEventsStatements) SelectRecentEvents(
ExcludeFromSync: excludeFromSync,
})
// we queried for 1 more than the limit, so if we returned one more mark limited=true
if len(r.Events) > eventFilter.Limit {
r.Limited = true
// re-slice the extra (oldest) event out: in chronological order this is the first entry, else the last.
if chronologicalOrder {
r.Events = r.Events[1:]
} else {
r.Events = r.Events[:len(r.Events)-1]
}
}
result[roomID] = r
}
defer internal.CloseAndLogIfError(ctx, rows, "selectRecentEvents: rows.close() failed")
if chronologicalOrder {
for _, x := range result {
for roomID, x := range result {
sort.SliceStable(x.Events, func(i int, j int) bool {
return x.Events[i].StreamPosition < x.Events[j].StreamPosition
})
// we queried for 1 more than the limit, so if we returned one more mark limited=true
if len(x.Events) > eventFilter.Limit {
x.Limited = true
// re-slice the extra (oldest) event out: in chronological order this is the first entry, else the last.
x.Events = x.Events[1:]
result[roomID] = x
}
}
} else {
for roomID, x := range result {
if len(x.Events) > eventFilter.Limit {
x.Limited = true
x.Events = x.Events[:len(x.Events)-1]
result[roomID] = x
}
}
}