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

Couple of guards around sql.ErrNoRows

Browse source
This commit is contained in:
Neil Alexander 2022-04-20 15:44:05 +01:00
parent de97ce3439
commit 7817640695
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
syncapi/streams/stream_pdu.go
View file

@ -229,6 +229,9 @@ func (p *PDUStreamProvider) addRoomDeltaToResponse(
eventFilter, true, true, eventFilter, true, true,
) )
if err != nil { if err != nil {
if err == sql.ErrNoRows {
return r.To, nil
}
return r.From, fmt.Errorf("p.DB.RecentEvents: %w", err) return r.From, fmt.Errorf("p.DB.RecentEvents: %w", err)
} }
recentEvents := p.DB.StreamEventsToEvents(device, recentStreamEvents) recentEvents := p.DB.StreamEventsToEvents(device, recentStreamEvents)
@ -273,7 +276,7 @@ func (p *PDUStreamProvider) addRoomDeltaToResponse(
ctx, delta.RoomID, true, limited, stateFilter.IncludeRedundantMembers, ctx, delta.RoomID, true, limited, stateFilter.IncludeRedundantMembers,
device, recentEvents, delta.StateEvents, device, recentEvents, delta.StateEvents,
) )
if err != nil { if err != nil && err != sql.ErrNoRows {
return r.From, fmt.Errorf("p.lazyLoadMembers: %w", err) return r.From, fmt.Errorf("p.lazyLoadMembers: %w", err)
} }
} }