diff options
| author | Till <2353100+S7evinK@users.noreply.github.com> | 2023-11-09 08:42:33 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-09 08:42:33 +0100 |
| commit | 699f5ca8c1f73ff7e4b70f0f9273ffcb1c195cdc (patch) | |
| tree | 924223527aadefe03cceb4f2736ac00b80dcb68b /syncapi/storage/postgres | |
| parent | ee73a90aea8349e2695ce555ac868bbf45c11d02 (diff) | |
More `rows.Close()` and `rows.Err()` (#3262)
Looks like we missed some `rows.Close()`
Even though `rows.Err()` is mostly not necessary, we should be more
consistent in the DB layer.
[skip ci]
Diffstat (limited to 'syncapi/storage/postgres')
| -rw-r--r-- | syncapi/storage/postgres/current_room_state_table.go | 2 | ||||
| -rw-r--r-- | syncapi/storage/postgres/memberships_table.go | 2 | ||||
| -rw-r--r-- | syncapi/storage/postgres/peeks_table.go | 2 | ||||
| -rw-r--r-- | syncapi/storage/postgres/presence_table.go | 2 |
4 files changed, 5 insertions, 3 deletions
diff --git a/syncapi/storage/postgres/current_room_state_table.go b/syncapi/storage/postgres/current_room_state_table.go index b0148bef..ec0b27ad 100644 --- a/syncapi/storage/postgres/current_room_state_table.go +++ b/syncapi/storage/postgres/current_room_state_table.go @@ -392,7 +392,7 @@ func currentRoomStateRowsToStreamEvents(rows *sql.Rows) ([]types.StreamEvent, er }) } - return events, nil + return events, rows.Err() } func rowsToEvents(rows *sql.Rows) ([]*rstypes.HeaderedEvent, error) { diff --git a/syncapi/storage/postgres/memberships_table.go b/syncapi/storage/postgres/memberships_table.go index 4fe4260d..e5208b89 100644 --- a/syncapi/storage/postgres/memberships_table.go +++ b/syncapi/storage/postgres/memberships_table.go @@ -19,6 +19,7 @@ import ( "database/sql" "fmt" + "github.com/matrix-org/dendrite/internal" "github.com/matrix-org/dendrite/internal/sqlutil" rstypes "github.com/matrix-org/dendrite/roomserver/types" "github.com/matrix-org/dendrite/syncapi/storage/tables" @@ -160,6 +161,7 @@ func (s *membershipsStatements) SelectMemberships( if err != nil { return } + defer internal.CloseAndLogIfError(ctx, rows, "SelectMemberships: failed to close rows") var ( eventID string ) diff --git a/syncapi/storage/postgres/peeks_table.go b/syncapi/storage/postgres/peeks_table.go index 64183073..1120dce0 100644 --- a/syncapi/storage/postgres/peeks_table.go +++ b/syncapi/storage/postgres/peeks_table.go @@ -164,7 +164,7 @@ func (s *peekStatements) SelectPeekingDevices( devices = append(devices, types.PeekingDevice{UserID: userID, DeviceID: deviceID}) result[roomID] = devices } - return result, nil + return result, rows.Err() } func (s *peekStatements) SelectMaxPeekID( diff --git a/syncapi/storage/postgres/presence_table.go b/syncapi/storage/postgres/presence_table.go index f37b5331..53acecce 100644 --- a/syncapi/storage/postgres/presence_table.go +++ b/syncapi/storage/postgres/presence_table.go @@ -144,7 +144,7 @@ func (p *presenceStatements) GetPresenceForUsers( presence.ClientFields.Presence = presence.Presence.String() result = append(result, presence) } - return result, err + return result, rows.Err() } func (p *presenceStatements) GetMaxPresenceID(ctx context.Context, txn *sql.Tx) (pos types.StreamPosition, err error) { |