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

thanks VS Code for doing exactly the wrong thing

Browse source
This commit is contained in:
Neil Alexander 2022-06-15 10:01:33 +01:00
parent 0be9c6bb7e
commit 158ffa4ded
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -997,10 +997,10 @@ func (d *Database) GetStateEvent(ctx context.Context, roomID, evType, stateKey s
if err != nil { if err != nil {
return nil, err return nil, err
} }
var inDatabase []types.EventNID var eventNIDs []types.EventNID
for _, e := range entries { for _, e := range entries {
if e.EventTypeNID == eventTypeNID && e.EventStateKeyNID == stateKeyNID { if e.EventTypeNID == eventTypeNID && e.EventStateKeyNID == stateKeyNID {
inDatabase = append(inDatabase, e.EventNID) eventNIDs = append(eventNIDs, e.EventNID)
} }
} }
eventIDs, _ := d.EventsTable.BulkSelectEventID(ctx, nil, eventNIDs) eventIDs, _ := d.EventsTable.BulkSelectEventID(ctx, nil, eventNIDs)
@ -1054,10 +1054,10 @@ func (d *Database) GetStateEventsWithEventType(ctx context.Context, roomID, evTy
if err != nil { if err != nil {
return nil, err return nil, err
} }
var inDatabase []types.EventNID var eventNIDs []types.EventNID
for _, e := range entries { for _, e := range entries {
if e.EventTypeNID == eventTypeNID { if e.EventTypeNID == eventTypeNID {
inDatabase = append(inDatabase, e.EventNID) eventNIDs = append(eventNIDs, e.EventNID)
} }
} }
eventIDs, _ := d.EventsTable.BulkSelectEventID(ctx, nil, eventNIDs) eventIDs, _ := d.EventsTable.BulkSelectEventID(ctx, nil, eventNIDs)
@ -1065,7 +1065,7 @@ func (d *Database) GetStateEventsWithEventType(ctx context.Context, roomID, evTy
eventIDs = map[types.EventNID]string{} eventIDs = map[types.EventNID]string{}
} }
// return the events requested // return the events requested
eventPairs, err := d.EventJSONTable.BulkSelectEventJSON(ctx, nil, inDatabase) eventPairs, err := d.EventJSONTable.BulkSelectEventJSON(ctx, nil, eventNIDs)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -1158,7 +1158,7 @@ func (d *Database) GetBulkStateContent(ctx context.Context, roomIDs []string, tu
stateKeyNIDSet[nid] = true stateKeyNIDSet[nid] = true
} }
var inDatabase []types.EventNID var eventNIDs []types.EventNID
eventNIDToVer := make(map[types.EventNID]gomatrixserverlib.RoomVersion) eventNIDToVer := make(map[types.EventNID]gomatrixserverlib.RoomVersion)
// TODO: This feels like this is going to be really slow... // TODO: This feels like this is going to be really slow...
for _, roomID := range roomIDs { for _, roomID := range roomIDs {
@ -1177,7 +1177,7 @@ func (d *Database) GetBulkStateContent(ctx context.Context, roomIDs []string, tu
for _, entry := range entries { for _, entry := range entries {
if typeNIDSet[entry.EventTypeNID] { if typeNIDSet[entry.EventTypeNID] {
if allowWildcard[entry.EventTypeNID] || stateKeyNIDSet[entry.EventStateKeyNID] { if allowWildcard[entry.EventTypeNID] || stateKeyNIDSet[entry.EventStateKeyNID] {
inDatabase = append(inDatabase, entry.EventNID) eventNIDs = append(eventNIDs, entry.EventNID)
eventNIDToVer[entry.EventNID] = roomInfo.RoomVersion eventNIDToVer[entry.EventNID] = roomInfo.RoomVersion
} }
} }
@ -1187,7 +1187,7 @@ func (d *Database) GetBulkStateContent(ctx context.Context, roomIDs []string, tu
if err != nil { if err != nil {
eventIDs = map[types.EventNID]string{} eventIDs = map[types.EventNID]string{}
} }
events, err := d.EventJSONTable.BulkSelectEventJSON(ctx, nil, inDatabase) events, err := d.EventJSONTable.BulkSelectEventJSON(ctx, nil, eventNIDs)
if err != nil { if err != nil {
return nil, fmt.Errorf("GetBulkStateContent: failed to load event JSON for event nids: %w", err) return nil, fmt.Errorf("GetBulkStateContent: failed to load event JSON for event nids: %w", err)
} }