mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-23 14:53:10 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix state block retrieval

Browse source
This commit is contained in:
Neil Alexander 2020-08-26 14:40:58 +01:00
parent db5a99e82b
commit 1cea9f7a1c
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -182,14 +182,15 @@ func (d *Database) StateForRoomID(
// the room doesn't exist or it doesn't have state // the room doesn't exist or it doesn't have state
return nil, nil return nil, nil
} }
stateBlockNIDs, err := d.StateSnapshotTable.BulkSelectStateBlockNIDs(ctx, []types.StateSnapshotNID{stateSnapshotNID}) stateBlockLists, err := d.StateSnapshotTable.BulkSelectStateBlockNIDs(ctx, []types.StateSnapshotNID{stateSnapshotNID})
if err != nil { if err != nil {
return nil, fmt.Errorf("d.StateSnapshotTable.BulkSelectStateBlockNIDs: %w", err) return nil, fmt.Errorf("d.StateSnapshotTable.BulkSelectStateBlockNIDs: %w", err)
} }
if len(stateBlockNIDs) != 1 { stateBlockNIDs := []types.StateBlockNID{}
return nil, fmt.Errorf("expected one StateBlockNIDList, got %d", len(stateBlockNIDs)) for _, stateBlockList := range stateBlockLists {
stateBlockNIDs = append(stateBlockNIDs, stateBlockList.StateBlockNIDs...)
} }
stateEventLists, err := d.StateBlockTable.BulkSelectStateBlockEntries(ctx, stateBlockNIDs[0].StateBlockNIDs) stateEventLists, err := d.StateBlockTable.BulkSelectStateBlockEntries(ctx, stateBlockNIDs)
if err != nil { if err != nil {
return nil, fmt.Errorf("d.StateBlockTable.BulkSelectStateBlockEntries: %w", err) return nil, fmt.Errorf("d.StateBlockTable.BulkSelectStateBlockEntries: %w", err)
} }