Skip to content

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

fix(store): remove unnecessary transactions from single-operation functions (#19054)

p0ny8c0bcf1938eb
diff --git a/backend/store/changelog.go b/backend/store/changelog.go
index 40b7c7f30b..d40514645a 100644
--- a/backend/store/changelog.go
+++ b/backend/store/changelog.go
@@ -64,12 +64,6 @@ type UpdateChangelogMessage struct {
}
func (s *Store) CreateChangelog(ctx context.Context, create *ChangelogMessage) (int64, error) {
- tx, err := s.GetDB().BeginTx(ctx, nil)
- if err != nil {
- return 0, errors.Wrapf(err, "failed to begin tx")
- }
- defer tx.Rollback()
-
p, err := protojson.Marshal(create.Payload)
if err != nil {
return 0, errors.Wrapf(err, "failed to marshal")
@@ -98,14 +92,10 @@ func (s *Store) CreateChangelog(ctx context.Context, create *ChangelogMessage) (
}
var id int64
- if err := tx.QueryRowContext(ctx, query, args...).Scan(&id); err != nil {
+ if err := s.GetDB().QueryRowContext(ctx, query, args...).Scan(&id); err != nil {
return 0, errors.Wrapf(err, "failed to insert")
}
- if err := tx.Commit(); err != nil {
- return 0, errors.Wrapf(err, "failed to commit tx")
- }
-
return id, nil
}
@@ -130,20 +120,10 @@ func (s *Store) UpdateChangelog(ctx context.Context, update *UpdateChangelogMess
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 tx")
- }
- defer tx.Rollback()
-
- if _, err := tx.ExecContext(ctx, query, args...); err != nil {
+ if _, err := s.GetDB().ExecContext(ctx, query, args...); err != nil {
return errors.Wrapf(err, "failed to update")
}
- if err := tx.Commit(); err != nil {
- return errors.Wrapf(err, "failed to commit")
- }
-
return nil
}
diff --git a/backend/store/database.go b/backend/store/database.go
index e26d7d6f37..383ac4d62e 100644
--- a/backend/store/database.go
+++ b/backend/store/database.go
@@ -234,27 +234,6 @@ func (s *Store) ListDatabases(ctx context.Context, find *FindDatabaseMessage) ([
// CreateDatabaseDefault creates a new database in the default project.
func (s *Store) CreateDatabaseDefault(ctx context.Context, create *DatabaseMessage) (*DatabaseMessage, error) {
- tx, err := s.GetDB().BeginTx(ctx, nil)
- if err != nil {
- return nil, err
- }
- defer tx.Rollback()
-
- if _, err := s.createDatabaseDefaultImpl(ctx, tx, create.ProjectID, create.InstanceID, create); err != nil {
- return nil, err
- }
-
- if err := tx.Commit(); err != nil {
- return nil, err
- }
-
- // Invalidate an update the cache.
- s.databaseCache.Remove(getDatabaseCacheKey(create.InstanceID, create.DatabaseName))
- return s.GetDatabase(ctx, &FindDatabaseMessage{InstanceID: &create.InstanceID, DatabaseName: &create.DatabaseName, ShowDeleted: true})
-}
-
-// createDatabaseDefault only creates a default database with charset, collation only in the default project.
-func (*Store) createDatabaseDefaultImpl(ctx context.Context, txn *sql.Tx, projectID, instanceID string, create *DatabaseMessage) (int, error) {
q := qb.Q().Space(`
INSERT INTO db (
instance,
@@ -266,22 +245,25 @@ func (*Store) createDatabaseDefaultImpl(ctx context.Context, txn *sql.Tx, projec
ON CONFLICT (instance, name) DO UPDATE SET
deleted = EXCLUDED.deleted
RETURNING id`,
- instanceID,
- projectID,
+ create.InstanceID,
+ create.ProjectID,
create.DatabaseName,
false,
)
query, args, err := q.ToSQL()
if err != nil {
- return 0, errors.Wrapf(err, "failed to build sql")
+ return nil, errors.Wrapf(err, "failed to build sql")
}
var databaseUID int
- if err := txn.QueryRowContext(ctx, query, args...).Scan(&databaseUID); err != nil {
- return 0, err
+ if err := s.GetDB().QueryRowContext(ctx, query, args...).Scan(&databaseUID); err != nil {
+ return nil, err
}
- return databaseUID, nil
+
+ // Invalidate and update the cache.
+ s.databaseCache.Remove(getDatabaseCacheKey(create.InstanceID, create.DatabaseName))
+ return s.GetDatabase(ctx, &FindDatabaseMessage{InstanceID: &create.InstanceID, DatabaseName: &create.DatabaseName, ShowDeleted: true})
}
// UpsertDatabase upserts a database.
@@ -291,12 +273,6 @@ func (s *Store) UpsertDatabase(ctx context.Context, create *DatabaseMessage) (*D
return nil, err
}
- tx, err := s.GetDB().BeginTx(ctx, nil)
- if err != nil {
- return nil, err
- }
- defer tx.Rollback()
-
var environment *string
if create.EnvironmentID != nil && *create.EnvironmentID != "" {
environment = create.EnvironmentID
@@ -332,10 +308,7 @@ func (s *Store) UpsertDatabase(ctx context.Context, create *DatabaseMessage) (*D
}
var databaseUID int
- if err := tx.QueryRowContext(ctx, query, args...).Scan(&databaseUID); err != nil {
- return nil, err
- }
- if err := tx.Commit(); err != nil {
+ if err := s.GetDB().QueryRowContext(ctx, query, args...).Scan(&databaseUID); err != nil {
return nil, err
}
@@ -391,17 +364,8 @@ func (s *Store) UpdateDatabase(ctx context.Context, patch *UpdateDatabaseMessage
return nil, errors.Wrapf(err, "failed to build sql")
}
- tx, err := s.GetDB().BeginTx(ctx, nil)
- if err != nil {
- return nil, err
- }
- defer tx.Rollback()
-
var databaseUID int
- if err := tx.QueryRowContext(ctx, query, args...).Scan(&databaseUID); err != nil {
- return nil, err
- }
- if err := tx.Commit(); err != nil {
+ if err := s.GetDB().QueryRowContext(ctx, query, args...).Scan(&databaseUID); err != nil {
return nil, err
}
diff --git a/backend/store/database_group.go b/backend/store/database_group.go
index b5695580f2..9c4e9a9a99 100644
--- a/backend/store/database_group.go
+++ b/backend/store/database_group.go
@@ -39,17 +39,9 @@ func (s *Store) DeleteDatabaseGroup(ctx context.Context, projectID, resourceID s
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")
- }
- defer tx.Rollback()
- if _, err := tx.ExecContext(ctx, query, args...); err != nil {
+ if _, err := s.GetDB().ExecContext(ctx, query, args...); err != nil {
return errors.Wrapf(err, "failed to execute")
}
- if err := tx.Commit(); err != nil {
- return errors.Wrapf(err, "failed to commit transaction")
- }
return nil
}
@@ -193,17 +185,8 @@ func (s *Store) CreateDatabaseGroup(ctx context.Context, create *DatabaseGroupMe
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")
- }
- defer tx.Rollback()
-
- if _, err := tx.ExecContext(ctx, query, args...); err != nil {
- return nil, errors.Wrapf(err, "failed to scan")
- }
- if err := tx.Commit(); err != nil {
- return nil, errors.Wrapf(err, "failed to commit transaction")
+ if _, err := s.GetDB().ExecContext(ctx, query, args...); err != nil {
+ return nil, errors.Wrapf(err, "failed to execute")
}
return create, nil
diff --git a/backend/store/group.go b/backend/store/group.go
index 57e38792eb..50f64135b1 100644
--- a/backend/store/group.go
+++ b/backend/store/group.go
@@ -201,20 +201,10 @@ func (s *Store) CreateGroup(ctx context.Context, create *GroupMessage) (*GroupMe
return nil, errors.Wrapf(err, "failed to build sql")
}
- tx, err := s.GetDB().BeginTx(ctx, nil)
- if err != nil {
- return nil, errors.Wrap(err, "failed to begin tx")
- }
- defer tx.Rollback()
-
- if err := tx.QueryRowContext(ctx, query, args...).Scan(&create.ID); err != nil {
+ if err := s.GetDB().QueryRowContext(ctx, query, args...).Scan(&create.ID); err != nil {
return nil, err
}
- if err := tx.Commit(); err != nil {
- return nil, errors.Wrap(err, "failed to commit")
- }
-
if create.Email != "" {
s.groupCache.Add(create.Email, create)
}
@@ -258,17 +248,11 @@ func (s *Store) UpdateGroup(ctx context.Context, patch *UpdateGroupMessage) (*Gr
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")
- }
- defer tx.Rollback()
-
var group GroupMessage
var payload []byte
var email sql.NullString
- if err := tx.QueryRowContext(ctx, query, args...).Scan(
+ if err := s.GetDB().QueryRowContext(ctx, query, args...).Scan(
&group.ID,
&email,
&group.Title,
@@ -287,10 +271,6 @@ func (s *Store) UpdateGroup(ctx context.Context, patch *UpdateGroupMessage) (*Gr
group.Email = email.String
}
- if err := tx.Commit(); err != nil {
- return nil, errors.Wrap(err, "failed to commit transaction")
- }
-
if group.Email != "" {
s.groupCache.Add(group.Email, &group)
s.groupMembersCache.Remove("groups/" + group.Email)
@@ -300,12 +280,6 @@ func (s *Store) UpdateGroup(ctx context.Context, patch *UpdateGroupMessage) (*Gr
// DeleteGroup deletes a group.
func (s *Store) DeleteGroup(ctx context.Context, id string) error {
- tx, err := s.GetDB().BeginTx(ctx, nil)
- if err != nil {
- return errors.Wrap(err, "failed to begin transaction")
- }
- defer tx.Rollback()
-
q := qb.Q().Space("DELETE FROM user_group WHERE id = ? RETURNING email", id)
query, args, err := q.ToSQL()
if err != nil {
@@ -313,14 +287,10 @@ func (s *Store) DeleteGroup(ctx context.Context, id string) error {
}
var email sql.NullString
- if err := tx.QueryRowContext(ctx, query, args...).Scan(&email); err != nil {
+ if err := s.GetDB().QueryRowContext(ctx, query, args...).Scan(&email); err != nil {
return err
}
- if err := tx.Commit(); err != nil {
- return errors.Wrap(err, "failed to commit transaction")
- }
-
if email.Valid && email.String != "" {
s.groupCache.Remove(email.String)
s.groupMembersCache.Remove("groups/" + email.String)
diff --git a/backend/store/instance.go b/backend/store/instance.go
index 26876e3365..2a0d109633 100644
--- a/backend/store/instance.go
+++ b/backend/store/instance.go
@@ -186,12 +186,6 @@ func (s *Store) CreateInstance(ctx context.Context, instanceCreate *InstanceMess
environment = instanceCreate.EnvironmentID
}
- tx, err := s.GetDB().BeginTx(ctx, nil)
- if err != nil {
- return nil, err
- }
- defer tx.Rollback()
-
q := qb.Q().Space(`
INSERT INTO instance (
resource_id,
@@ -203,11 +197,7 @@ func (s *Store) CreateInstance(ctx context.Context, instanceCreate *InstanceMess
if err != nil {
return nil, errors.Wrapf(err, "failed to build sql")
}
- if _, err := tx.ExecContext(ctx, query, args...); err != nil {
- return nil, err
- }
-
- if err := tx.Commit(); err != nil {
+ if _, err := s.GetDB().ExecContext(ctx, query, args...); err != nil {
return nil, err
}
@@ -271,17 +261,7 @@ func (s *Store) UpdateInstance(ctx context.Context, patch *UpdateInstanceMessage
return nil, errors.Wrapf(err, "failed to build sql")
}
- tx, err := s.GetDB().BeginTx(ctx, nil)
- if err != nil {
- return nil, err
- }
- defer tx.Rollback()
-
- if _, err := tx.ExecContext(ctx, query, args...); err != nil {
- return nil, err
- }
-
- if err := tx.Commit(); err != nil {
+ if _, err := s.GetDB().ExecContext(ctx, query, args...); err != nil {
return nil, err
}
diff --git a/backend/store/issue.go b/backend/store/issue.go
index be00223716..dff8d0e5a8 100644
--- a/backend/store/issue.go
+++ b/backend/store/issue.go
@@ -2,7 +2,6 @@ package store
import (
"context"
- "database/sql"
"fmt"
"strings"
"time"
@@ -132,19 +131,7 @@ func (s *Store) CreateIssue(ctx context.Context, create *IssueMessage) (*IssueMe
return nil, errors.Wrapf(err, "failed to build sql")
}
- tx, err := s.GetDB().BeginTx(ctx, nil)
- if err != nil {
- return nil, err
- }
- defer tx.Rollback()
-
- if err := tx.QueryRowContext(ctx, query, args...).Scan(&create.UID); err != nil {
- if err == sql.ErrNoRows {
- return nil, common.FormatDBErrorEmptyRowWithQuery(query)
- }
- return nil, err
- }
- if err := tx.Commit(); err != nil {
+ if err := s.GetDB().QueryRowContext(ctx, query, args...).Scan(&create.UID); err != nil {
return nil, err
}
@@ -201,17 +188,7 @@ func (s *Store) UpdateIssue(ctx context.Context, uid int, patch *UpdateIssueMess
return nil, errors.Wrapf(err, "failed to build sql")
}
- tx, err := s.GetDB().BeginTx(ctx, nil)
- if err != nil {
- return nil, err
- }
- defer tx.Rollback()
-
- if _, err := tx.ExecContext(ctx, query, args...); err != nil {
- return nil, err
- }
-
- if err := tx.Commit(); err != nil {
+ if _, err := s.GetDB().ExecContext(ctx, query, args...); err != nil {
return nil, err
}
@@ -306,13 +283,8 @@ func (s *Store) ListIssues(ctx context.Context, find *FindIssueMessage) ([]*Issu
}
var issues []*IssueMessage
- tx, err := s.GetDB().BeginTx(ctx, &sql.TxOptions{ReadOnly: true})
- if err != nil {
- return nil, err
- }
- defer tx.Rollback()
- rows, err := tx.QueryContext(ctx, query, args...)
+ rows, err := s.GetDB().QueryContext(ctx, query, args...)
if err != nil {
return nil, err
}
@@ -358,10 +330,6 @@ func (s *Store) ListIssues(ctx context.Context, find *FindIssueMessage) ([]*Issu
return nil, err
}
- if err := tx.Commit(); err != nil {
- return nil, err
- }
-
return issues, nil
}
diff --git a/backend/store/plan.go b/backend/store/plan.go
index 355f96fb22..32cf3a3bf9 100644
--- a/backend/store/plan.go
+++ b/backend/store/plan.go
@@ -2,7 +2,6 @@ package store
import (
"context"
- "database/sql"
"fmt"
"strings"
"time"
@@ -84,21 +83,11 @@ func (s *Store) CreatePlan(ctx context.Context, plan *PlanMessage, creator strin
return nil, errors.Wrap(err, "failed to build sql")
}
- tx, err := s.GetDB().BeginTx(ctx, nil)
- if err != nil {
- return nil, errors.Wrap(err, "failed to begin transaction")
- }
- defer tx.Rollback()
-
var id int64
- if err := tx.QueryRowContext(ctx, query, args...).Scan(&id, &plan.CreatedAt, &plan.UpdatedAt); err != nil {
+ if err := s.GetDB().QueryRowContext(ctx, query, args...).Scan(&id, &plan.CreatedAt, &plan.UpdatedAt); err != nil {
return nil, errors.Wrap(err, "failed to insert plan")
}
- if err := tx.Commit(); err != nil {
- return nil, errors.Wrap(err, "failed to commit transaction")
- }
-
plan.UID = id
plan.Creator = creator
return plan, nil
@@ -174,13 +163,7 @@ func (s *Store) ListPlans(ctx context.Context, find *FindPlanMessage) ([]*PlanMe
return nil, errors.Wrap(err, "failed to build sql")
}
- tx, err := s.GetDB().BeginTx(ctx, &sql.TxOptions{ReadOnly: true})
- if err != nil {
- return nil, errors.Wrap(err, "failed to begin transaction")
- }
- defer tx.Rollback()
-
- rows, err := tx.QueryContext(ctx, query, args...)
+ rows, err := s.GetDB().QueryContext(ctx, query, args...)
if err != nil {
return nil, errors.Wrap(err, "failed to select plans")
}
@@ -214,10 +197,6 @@ func (s *Store) ListPlans(ctx context.Context, find *FindPlanMessage) ([]*PlanMe
return nil, errors.Wrap(err, "failed to iterate plans")
}
- if err := tx.Commit(); err != nil {
- return nil, errors.Wrap(err, "failed to commit transaction")
- }
-
return plans, nil
}
@@ -255,17 +234,11 @@ func (s *Store) UpdatePlan(ctx context.Context, patch *UpdatePlanMessage) (*Plan
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")
- }
- defer tx.Rollback()
-
plan := PlanMessage{
Config: &storepb.PlanConfig{},
}
var config []byte
- if err := tx.QueryRowContext(ctx, query, finalArgs...).Scan(
+ if err := s.GetDB().QueryRowContext(ctx, query, finalArgs...).Scan(
&plan.UID,
&plan.Creator,
&plan.CreatedAt,
@@ -282,10 +255,6 @@ func (s *Store) UpdatePlan(ctx context.Context, patch *UpdatePlanMessage) (*Plan
return nil, errors.Wrapf(err, "failed to unmarshal plan config")
}
- if err := tx.Commit(); err != nil {
- return nil, errors.Wrapf(err, "failed to commit transaction")
- }
-
return &plan, nil
}
diff --git a/backend/store/project.go b/backend/store/project.go
index 05797e7e0f..fcba64e403 100644
--- a/backend/store/project.go
+++ b/backend/store/project.go
@@ -205,7 +205,7 @@ func (s *Store) CreateProject(ctx context.Context, create *ProjectMessage, creat
return nil, err
}
- policy := &storepb.IamPolicy{
+ iamPolicy := &storepb.IamPolicy{
Bindings: []*storepb.Binding{
{
Role: common.FormatRole(ProjectOwnerRole),
@@ -216,11 +216,11 @@ func (s *Store) CreateProject(ctx context.Context, create *ProjectMessage, creat
},
},
}
- policyPayload, err := protojson.Marshal(policy)
+ policyPayload, err := protojson.Marshal(iamPolicy)
if err != nil {
return nil, err
}
- if _, err := s.CreatePolicy(ctx, &PolicyMessage{
+ policyMessage, err := upsertPolicyImpl(ctx, tx, &PolicyMessage{
ResourceType: storepb.Policy_PROJECT,
Resource: common.FormatProject(project.ResourceID),
Payload: string(policyPayload),
@@ -228,7 +228,8 @@ func (s *Store) CreateProject(ctx context.Context, create *ProjectMessage, creat
InheritFromParent: false,
// Enforce cannot be false while creating a policy.
Enforce: true,
- }); err != nil {
+ })
+ if err != nil {
return nil, err
}
@@ -236,6 +237,7 @@ func (s *Store) CreateProject(ctx context.Context, create *ProjectMessage, creat
return nil, err
}
+ s.policyCache.Add(getPolicyCacheKey(policyMessage.ResourceType, policyMessage.Resource, policyMessage.Type), policyMessage)
s.storeProjectCache(project)
return project, nil
}