Skip to content

Database governance built for humans and agents — controlling changes and access across every major database.

fix(store): remove unnecessary transactions and fix resource leaks (#19051)

p0nyfa87a973f9a6
diff --git a/backend/store/project_webhook.go b/backend/store/project_webhook.go
index cb6ba3e141..6b8cf7ae69 100644
--- a/backend/store/project_webhook.go
+++ b/backend/store/project_webhook.go
@@ -67,12 +67,7 @@ func (s *Store) CreateProjectWebhook(ctx context.Context, projectID string, crea
return nil, errors.Wrapf(err, "failed to build sql")
}
- tx, err := s.GetDB().BeginTx(ctx, nil)
- if err != nil {
- return nil, errors.Wrapf(err, "failed to begin transaction")
- }
-
- if err := tx.QueryRowContext(ctx, query, args...).Scan(
+ if err := s.GetDB().QueryRowContext(ctx, query, args...).Scan(
&projectWebhook.ID,
); err != nil {
if err == sql.ErrNoRows {
@@ -80,9 +75,6 @@ func (s *Store) CreateProjectWebhook(ctx context.Context, projectID string, crea
}
return nil, err
}
- if err := tx.Commit(); err != nil {
- return nil, errors.Wrapf(err, "failed to commit transaction")
- }
s.removeProjectCache(projectID)
return &projectWebhook, nil
@@ -180,11 +172,6 @@ func (s *Store) GetProjectWebhook(ctx context.Context, find *FindProjectWebhookM
// UpdateProjectWebhook updates an instance of ProjectWebhook.
func (s *Store) UpdateProjectWebhook(ctx context.Context, projectResourceID string, projectWebhookID int, update *UpdateProjectWebhookMessage) (*ProjectWebhookMessage, error) {
- tx, err := s.GetDB().BeginTx(ctx, nil)
- if err != nil {
- return nil, errors.Wrapf(err, "failed to begin transaction")
- }
-
var payload []byte
if update.Payload != nil {
p, err := protojson.Marshal(update.Payload)
@@ -211,7 +198,7 @@ func (s *Store) UpdateProjectWebhook(ctx context.Context, projectResourceID stri
}
var returnedPayload []byte
// Execute update query with RETURNING.
- if err := tx.QueryRowContext(ctx, query, args...).Scan(
+ if err := s.GetDB().QueryRowContext(ctx, query, args...).Scan(
&projectWebhook.ID,
&projectWebhook.ProjectID,
&returnedPayload,
@@ -226,10 +213,6 @@ func (s *Store) UpdateProjectWebhook(ctx context.Context, projectResourceID stri
return nil, errors.Wrapf(err, "failed to unmarshal")
}
- if err := tx.Commit(); err != nil {
- return nil, errors.Wrapf(err, "failed to commit transaction")
- }
-
s.removeProjectCache(projectResourceID)
return &projectWebhook, nil
}
@@ -243,19 +226,10 @@ func (s *Store) DeleteProjectWebhook(ctx context.Context, projectResourceID stri
return errors.Wrapf(err, "failed to build sql")
}
- tx, err := s.GetDB().BeginTx(ctx, nil)
- if err != nil {
- return errors.Wrapf(err, "failed to begin transaction")
- }
-
- if _, err := tx.ExecContext(ctx, query, args...); err != nil {
+ if _, err := s.GetDB().ExecContext(ctx, query, args...); err != nil {
return err
}
- if err := tx.Commit(); err != nil {
- return errors.Wrapf(err, "failed to commit transaction")
- }
-
s.removeProjectCache(projectResourceID)
return nil
}
diff --git a/backend/store/stats.go b/backend/store/stats.go
index efe0272d57..05b62ec2e4 100644
--- a/backend/store/stats.go
+++ b/backend/store/stats.go
@@ -18,17 +18,8 @@ func (s *Store) CountActiveInstances(ctx context.Context) (int, error) {
return 0, errors.Wrapf(err, "failed to build sql")
}
- tx, err := s.GetDB().BeginTx(ctx, nil)
- if err != nil {
- return 0, err
- }
- defer tx.Rollback()
-
var count int
- if err := tx.QueryRowContext(ctx, query, args...).Scan(&count); err != nil {
- return 0, err
- }
- if err := tx.Commit(); err != nil {
+ if err := s.GetDB().QueryRowContext(ctx, query, args...).Scan(&count); err != nil {
return 0, err
}
return count, nil
@@ -36,12 +27,6 @@ func (s *Store) CountActiveInstances(ctx context.Context) (int, error) {
// CountActiveEndUsers counts the number of endusers.
func (s *Store) CountActiveEndUsers(ctx context.Context) (int, error) {
- tx, err := s.GetDB().BeginTx(ctx, nil)
- if err != nil {
- return 0, err
- }
- defer tx.Rollback()
-
q := qb.Q().Space("SELECT count(DISTINCT principal.id) FROM principal WHERE principal.deleted = ? AND principal.type = ?", false, storepb.PrincipalType_END_USER.String())
query, args, err := q.ToSQL()
if err != nil {
@@ -49,10 +34,7 @@ func (s *Store) CountActiveEndUsers(ctx context.Context) (int, error) {
}
var count int
- if err := tx.QueryRowContext(ctx, query, args...).Scan(&count); err != nil {
- return 0, err
- }
- if err := tx.Commit(); err != nil {
+ if err := s.GetDB().QueryRowContext(ctx, query, args...).Scan(&count); err != nil {
return 0, err
}
return count, nil
diff --git a/backend/store/worksheet.go b/backend/store/worksheet.go
index 630c76fc3d..1dc8cc6f03 100644
--- a/backend/store/worksheet.go
+++ b/backend/store/worksheet.go
@@ -226,17 +226,38 @@ func (s *Store) CreateWorkSheet(ctx context.Context, create *WorkSheetMessage) (
// PatchWorkSheet updates a sheet.
func (s *Store) PatchWorkSheet(ctx context.Context, patch *PatchWorkSheetMessage) error {
- tx, err := s.GetDB().BeginTx(ctx, nil)
- if err != nil {
- return errors.Wrapf(err, "failed to begin transaction")
+ set := qb.Q()
+ set.Comma("updated_at = ?", time.Now())
+ if v := patch.Title; v != nil {
+ set.Comma("name = ?", *v)
}
-
- if err := patchWorkSheetImpl(ctx, tx, patch); err != nil {
- return err
+ if v := patch.Statement; v != nil {
+ set.Comma("statement = ?", *v)
+ }
+ if v := patch.Visibility; v != nil {
+ set.Comma("visibility = ?", *v)
+ }
+ if v := patch.InstanceID; v != nil {
+ if *v == "" {
+ set.Comma("instance = ?", nil)
+ } else {
+ set.Comma("instance = ?", *v)
+ }
+ }
+ if v := patch.DatabaseName; v != nil {
+ if *v == "" {
+ set.Comma("db_name = ?", nil)
+ } else {
+ set.Comma("db_name = ?", *v)
+ }
}
- if err := tx.Commit(); err != nil {
- return errors.Wrapf(err, "failed to commit transaction")
+ query, args, err := qb.Q().Space("UPDATE worksheet SET ? WHERE id = ?", set, patch.UID).ToSQL()
+ if err != nil {
+ return errors.Wrapf(err, "failed to build sql")
+ }
+ if _, err := s.GetDB().ExecContext(ctx, query, args...); err != nil {
+ return err
}
return nil
}
@@ -270,44 +291,6 @@ func (s *Store) DeleteWorkSheet(ctx context.Context, sheetUID int) error {
return tx.Commit()
}
-// patchWorkSheetImpl updates a sheet's name/statement/visibility/instance/db_name/project.
-func patchWorkSheetImpl(ctx context.Context, txn *sql.Tx, patch *PatchWorkSheetMessage) error {
- set := qb.Q()
- set.Comma("updated_at = ?", time.Now())
- if v := patch.Title; v != nil {
- set.Comma("name = ?", *v)
- }
- if v := patch.Statement; v != nil {
- set.Comma("statement = ?", *v)
- }
- if v := patch.Visibility; v != nil {
- set.Comma("visibility = ?", *v)
- }
- if v := patch.InstanceID; v != nil {
- if *v == "" {
- set.Comma("instance = ?", nil)
- } else {
- set.Comma("instance = ?", *v)
- }
- }
- if v := patch.DatabaseName; v != nil {
- if *v == "" {
- set.Comma("db_name = ?", nil)
- } else {
- set.Comma("db_name = ?", *v)
- }
- }
-
- query, args, err := qb.Q().Space("UPDATE worksheet SET ? WHERE id = ?", set, patch.UID).ToSQL()
- if err != nil {
- return errors.Wrapf(err, "failed to build sql")
- }
- if _, err := txn.ExecContext(ctx, query, args...); err != nil {
- return err
- }
- return nil
-}
-
// WorksheetOrganizerMessage is the store message for worksheet organizer.
type WorksheetOrganizerMessage struct {
UID int