Skip to content

Fix #911 - close the Rows object #913

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lars-t-hansen wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix #911 - close the Rows object #913

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions code/sonalyze/db/timescaledb.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@ type databaseConnection struct {
lock sync.Mutex
}

// NOTE! That the Rows object must be closed after use.
func (cdb *databaseConnection) Query(cx context.Context, q string, arg ...any) (pgx.Rows, error) {
cdb.lock.Lock()
defer cdb.lock.Unlock()
Expand All @@ -116,6 +117,7 @@ func (cdb *databaseConnection) Query(cx context.Context, q string, arg ...any) (
func (cdb *databaseConnection) QueryRowAndScan(cx context.Context, q string, args []any, slots []any) error {
cdb.lock.Lock()
defer cdb.lock.Unlock()
// The single row does not need to be closed explicitly.
return cdb.connection.QueryRow(cx, q, args...).Scan(slots...)
}

Expand All @@ -135,6 +137,7 @@ func (cdb *databaseConnection) EnumerateClusters() ([]string, error) {
if err != nil {
return nil, err
}
defer rows.Close()
rawClusters, err := pgx.CollectRows(rows, pgx.RowTo[string])
if err != nil {
return nil, err
Expand Down Expand Up @@ -1094,6 +1097,7 @@ func querySlice[T any](
if err != nil {
return
}
defer rows.Close()
dataRows := make([]*T, 0)
_, err = pgx.ForEachRow(rows, q.boxes, func() error {
dataRows = append(dataRows, unbox())
Expand Down
Loading