hoernschen/dendrite
1
0
Fork 0
mirror of https://github.com/hoernschen/dendrite.git synced 2025-04-10 13:53:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix empty state snapshots

Browse source
This commit is contained in:
Neil Alexander 2021-04-15 09:18:43 +01:00
parent a799847070
commit b7cf702a14
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
4 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
roomserver/state/state.go
View file

@ -463,7 +463,7 @@ func (v *StateResolution) CalculateAndStoreStateBeforeEvent(
// Load the state at the prev events. // Load the state at the prev events.
prevStates, err := v.db.StateAtEventIDs(ctx, event.PrevEventIDs()) prevStates, err := v.db.StateAtEventIDs(ctx, event.PrevEventIDs())
if err != nil { if err != nil {
return 0, err return 0, fmt.Errorf("v.db.StateAtEventIDs: %w", err)
} }
// The state before this event will be the state after the events that came before it. // The state before this event will be the state after the events that came before it.

1
roomserver/storage/postgres/state_table.go
View file

@ -99,6 +99,7 @@ func (s *stateStatements) BulkSelectState(
if err = rows.Scan(&stateNID, &eventNIDs); err != nil { if err = rows.Scan(&stateNID, &eventNIDs); err != nil {
return nil, err return nil, err
} }
results[types.StateSnapshotNID(stateNID)] = []types.EventNID{}
for _, id := range eventNIDs { for _, id := range eventNIDs {
results[types.StateSnapshotNID(stateNID)] = append( results[types.StateSnapshotNID(stateNID)] = append(
results[types.StateSnapshotNID(stateNID)], results[types.StateSnapshotNID(stateNID)],

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

@ -215,7 +215,7 @@ func (d *Database) StateEntries(
) ([]types.StateEntry, error) { ) ([]types.StateEntry, error) {
nids, err := d.StateTable.BulkSelectState(ctx, []types.StateSnapshotNID{stateSnapshotNID}) nids, err := d.StateTable.BulkSelectState(ctx, []types.StateSnapshotNID{stateSnapshotNID})
if err != nil { if err != nil {
return nil, fmt.Errorf("d.StateTable.BulkSelectState: %w", err) return nil, fmt.Errorf("d.StateTable.BulkSelectState: %w (ID %d)", err, stateSnapshotNID)
} }
state, ok := nids[stateSnapshotNID] state, ok := nids[stateSnapshotNID]
if !ok { if !ok {

9
roomserver/storage/sqlite3/state_table.go
View file

@ -111,16 +111,11 @@ func (s *stateStatements) BulkSelectState(
if err = rows.Scan(&stateNID, &eventNIDJSON); err != nil { if err = rows.Scan(&stateNID, &eventNIDJSON); err != nil {
return nil, fmt.Errorf("rows.Scan: %w", err) return nil, fmt.Errorf("rows.Scan: %w", err)
} }
var eventNIDs []int64 var eventNIDs []types.EventNID
if err = json.Unmarshal(eventNIDJSON, &eventNIDs); err != nil { if err = json.Unmarshal(eventNIDJSON, &eventNIDs); err != nil {
return nil, fmt.Errorf("json.Unmarshal: %w", err) return nil, fmt.Errorf("json.Unmarshal: %w", err)
} }
for _, id := range eventNIDs { results[types.StateSnapshotNID(stateNID)] = eventNIDs
results[types.StateSnapshotNID(stateNID)] = append(
results[types.StateSnapshotNID(stateNID)],
types.EventNID(id),
)
}
} }
if err = rows.Err(); err != nil { if err = rows.Err(); err != nil {
return nil, fmt.Errorf("rows.Err: %w", err) return nil, fmt.Errorf("rows.Err: %w", err)