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

Stronger sorting

Browse source
This commit is contained in:
Neil Alexander 2022-06-15 11:14:45 +01:00
parent 7f0bc0d4aa
commit 4e8f1a7d3f
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
roomserver/state/state.go
View file

@ -1036,7 +1036,6 @@ func (v *StateResolution) loadStateEvents(
eventNIDs = append(eventNIDs, entry.EventNID) eventNIDs = append(eventNIDs, entry.EventNID)
} }
} }
sort.Sort(eventNIDs)
events, err := v.db.Events(ctx, eventNIDs) events, err := v.db.Events(ctx, eventNIDs)
if err != nil { if err != nil {
return nil, nil, err return nil, nil, err

5
roomserver/storage/shared/storage.go
View file

@ -433,8 +433,9 @@ func (d *Database) Events(
} }
func (d *Database) events( func (d *Database) events(
ctx context.Context, txn *sql.Tx, inputEventNIDs []types.EventNID, ctx context.Context, txn *sql.Tx, inputEventNIDs types.EventNIDs,
) ([]types.Event, error) { ) ([]types.Event, error) {
sort.Sort(inputEventNIDs)
events := make(map[types.EventNID]*gomatrixserverlib.Event, len(inputEventNIDs)) events := make(map[types.EventNID]*gomatrixserverlib.Event, len(inputEventNIDs))
eventNIDs := make([]types.EventNID, 0, len(inputEventNIDs)) eventNIDs := make([]types.EventNID, 0, len(inputEventNIDs))
for _, nid := range inputEventNIDs { for _, nid := range inputEventNIDs {
@ -496,7 +497,7 @@ func (d *Database) events(
for _, nid := range inputEventNIDs { for _, nid := range inputEventNIDs {
event, ok := events[nid] event, ok := events[nid]
if !ok || event == nil { if !ok || event == nil {
panic("missing event") return nil, fmt.Errorf("event %d missing", nid)
} }
results = append(results, types.Event{ results = append(results, types.Event{
EventNID: nid, EventNID: nid,