aboutsummaryrefslogtreecommitdiff
path: root/syncapi/storage/shared/syncserver.go
diff options
context:
space:
mode:
authorNeil Alexander <neilalexander@users.noreply.github.com>2022-04-20 16:51:37 +0100
committerGitHub <noreply@github.com>2022-04-20 16:51:37 +0100
commit54e7ea41c688a0bcc89150c99045b2dcdf8d0b12 (patch)
tree26f306aec904ec45822bec4fc35d84b3ea684551 /syncapi/storage/shared/syncserver.go
parentbb987cd64b118044a4f3351c377516813514ee19 (diff)
Eliminate more SQL no row errors in sync API (#2363)
* Handle `sql.ErrNoRows` in main `/sync` codepaths * Catch more
Diffstat (limited to 'syncapi/storage/shared/syncserver.go')
-rw-r--r--syncapi/storage/shared/syncserver.go34
1 files changed, 32 insertions, 2 deletions
diff --git a/syncapi/storage/shared/syncserver.go b/syncapi/storage/shared/syncserver.go
index 91eba44e..2143fd67 100644
--- a/syncapi/storage/shared/syncserver.go
+++ b/syncapi/storage/shared/syncserver.go
@@ -688,6 +688,9 @@ func (d *Database) GetStateDeltas(
// user has ever interacted with — joined to, kicked/banned from, left.
memberships, err := d.CurrentRoomState.SelectRoomIDsWithAnyMembership(ctx, txn, userID)
if err != nil {
+ if err == sql.ErrNoRows {
+ return nil, nil, nil
+ }
return nil, nil, err
}
@@ -705,17 +708,23 @@ func (d *Database) GetStateDeltas(
// get all the state events ever (i.e. for all available rooms) between these two positions
stateNeeded, eventMap, err := d.OutputEvents.SelectStateInRange(ctx, txn, r, stateFilter, allRoomIDs)
if err != nil {
+ if err == sql.ErrNoRows {
+ return nil, nil, nil
+ }
return nil, nil, err
}
state, err := d.fetchStateEvents(ctx, txn, stateNeeded, eventMap)
if err != nil {
+ if err == sql.ErrNoRows {
+ return nil, nil, nil
+ }
return nil, nil, err
}
// find out which rooms this user is peeking, if any.
// We do this before joins so any peeks get overwritten
peeks, err := d.Peeks.SelectPeeksInRange(ctx, txn, userID, device.ID, r)
- if err != nil {
+ if err != nil && err != sql.ErrNoRows {
return nil, nil, err
}
@@ -726,6 +735,9 @@ func (d *Database) GetStateDeltas(
var s []types.StreamEvent
s, err = d.currentStateStreamEventsForRoom(ctx, txn, peek.RoomID, stateFilter)
if err != nil {
+ if err == sql.ErrNoRows {
+ continue
+ }
return nil, nil, err
}
state[peek.RoomID] = s
@@ -753,6 +765,9 @@ func (d *Database) GetStateDeltas(
var s []types.StreamEvent
s, err = d.currentStateStreamEventsForRoom(ctx, txn, roomID, stateFilter)
if err != nil {
+ if err == sql.ErrNoRows {
+ continue
+ }
return nil, nil, err
}
state[roomID] = s
@@ -803,6 +818,9 @@ func (d *Database) GetStateDeltasForFullStateSync(
// user has ever interacted with — joined to, kicked/banned from, left.
memberships, err := d.CurrentRoomState.SelectRoomIDsWithAnyMembership(ctx, txn, userID)
if err != nil {
+ if err == sql.ErrNoRows {
+ return nil, nil, nil
+ }
return nil, nil, err
}
@@ -819,7 +837,7 @@ func (d *Database) GetStateDeltasForFullStateSync(
deltas := make(map[string]types.StateDelta)
peeks, err := d.Peeks.SelectPeeksInRange(ctx, txn, userID, device.ID, r)
- if err != nil {
+ if err != nil && err != sql.ErrNoRows {
return nil, nil, err
}
@@ -828,6 +846,9 @@ func (d *Database) GetStateDeltasForFullStateSync(
if !peek.Deleted {
s, stateErr := d.currentStateStreamEventsForRoom(ctx, txn, peek.RoomID, stateFilter)
if stateErr != nil {
+ if stateErr == sql.ErrNoRows {
+ continue
+ }
return nil, nil, stateErr
}
deltas[peek.RoomID] = types.StateDelta{
@@ -841,10 +862,16 @@ func (d *Database) GetStateDeltasForFullStateSync(
// Get all the state events ever between these two positions
stateNeeded, eventMap, err := d.OutputEvents.SelectStateInRange(ctx, txn, r, stateFilter, allRoomIDs)
if err != nil {
+ if err == sql.ErrNoRows {
+ return nil, nil, nil
+ }
return nil, nil, err
}
state, err := d.fetchStateEvents(ctx, txn, stateNeeded, eventMap)
if err != nil {
+ if err == sql.ErrNoRows {
+ return nil, nil, nil
+ }
return nil, nil, err
}
@@ -869,6 +896,9 @@ func (d *Database) GetStateDeltasForFullStateSync(
for _, joinedRoomID := range joinedRoomIDs {
s, stateErr := d.currentStateStreamEventsForRoom(ctx, txn, joinedRoomID, stateFilter)
if stateErr != nil {
+ if stateErr == sql.ErrNoRows {
+ continue
+ }
return nil, nil, stateErr
}
deltas[joinedRoomID] = types.StateDelta{