Database governance built for humans and agents — controlling changes and access across every major database.
Go cicddata-governancedata-maskingdata-securitydatabase-accessdatabase-governancedevopsdevsecopsflywaygitopsliquibasemongodbmysqloraclepostgresqlschema-migrationssecuritysql-clientsqlservertidb
refactor(store): remove unnecessary single-operation transactions (#19134)
p0ny820b1597e2f0
diff --git a/backend/store/db_schema.go b/backend/store/db_schema.goindex 1fbd5cabd1..e64b26af17 100644--- a/backend/store/db_schema.go+++ b/backend/store/db_schema.go@@ -38,14 +38,8 @@ func (s *Store) GetDBSchema(ctx context.Context, find *FindDBSchemaMessage) (*moreturn nil, errors.Wrapf(err, "failed to build sql")}- tx, err := s.GetDB().BeginTx(ctx, &sql.TxOptions{ReadOnly: true})- if err != nil {- return nil, err- }- defer tx.Rollback()-var metadata, schema, config []byte- if err := tx.QueryRowContext(ctx, query, args...).Scan(+ if err := s.GetDB().QueryRowContext(ctx, query, args...).Scan(&metadata,&schema,&config,@@ -55,9 +49,6 @@ func (s *Store) GetDBSchema(ctx context.Context, find *FindDBSchemaMessage) (*mo}return nil, err}- if err := tx.Commit(); err != nil {- return nil, err- }dbMetadata, err := s.convertMetadataAndConfig(ctx, metadata, schema, config, find.InstanceID)if err != nil {diff --git a/backend/store/export_archive.go b/backend/store/export_archive.goindex 7d91ef45af..414c513575 100644--- a/backend/store/export_archive.go+++ b/backend/store/export_archive.go@@ -2,7 +2,6 @@ package storeimport ("context"- "database/sql""time""github.com/pkg/errors"@@ -61,13 +60,7 @@ func (s *Store) ListExportArchives(ctx context.Context, find *FindExportArchiveMreturn nil, errors.Wrapf(err, "failed to build sql")}- 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}@@ -96,9 +89,6 @@ func (s *Store) ListExportArchives(ctx context.Context, find *FindExportArchiveMif err := rows.Err(); err != nil {return nil, err}- if err := tx.Commit(); err != nil {- return nil, err- }return exportArchives, nil}diff --git a/backend/store/idp.go b/backend/store/idp.goindex d96e12c320..93083f8366 100644--- a/backend/store/idp.go+++ b/backend/store/idp.go@@ -104,12 +104,6 @@ func (s *Store) GetIdentityProvider(ctx context.Context, find *FindIdentityProvi// ListIdentityProviders lists identity providers.func (s *Store) ListIdentityProviders(ctx context.Context, find *FindIdentityProviderMessage) ([]*IdentityProviderMessage, error) {- tx, err := s.GetDB().BeginTx(ctx, &sql.TxOptions{ReadOnly: true})- if err != nil {- return nil, err- }- defer tx.Rollback()-q := qb.Q().Space(`SELECTresource_id,@@ -132,7 +126,7 @@ func (s *Store) ListIdentityProviders(ctx context.Context, find *FindIdentityProreturn nil, errors.Wrapf(err, "failed to build sql")}- rows, err := tx.QueryContext(ctx, query, args...)+ rows, err := s.GetDB().QueryContext(ctx, query, args...)if err != nil {return nil, err}@@ -159,33 +153,12 @@ func (s *Store) ListIdentityProviders(ctx context.Context, find *FindIdentityProif err := rows.Err(); err != nil {return nil, err}- if err := tx.Commit(); err != nil {- return nil, err- }return identityProviderMessages, nil}// UpdateIdentityProvider updates an identity provider.func (s *Store) UpdateIdentityProvider(ctx context.Context, patch *UpdateIdentityProviderMessage) (*IdentityProviderMessage, error) {- tx, err := s.GetDB().BeginTx(ctx, nil)- if err != nil {- return nil, err- }- defer tx.Rollback()-- identityProvider, err := s.updateIdentityProviderImpl(ctx, tx, patch)- if err != nil {- return nil, err- }- if err := tx.Commit(); err != nil {- return nil, err- }-- return identityProvider, nil-}--func (*Store) updateIdentityProviderImpl(ctx context.Context, txn *sql.Tx, patch *UpdateIdentityProviderMessage) (*IdentityProviderMessage, error) {set := qb.Q()if v := patch.Title; v != nil {set.Comma("name = ?", *v)@@ -224,7 +197,7 @@ func (*Store) updateIdentityProviderImpl(ctx context.Context, txn *sql.Tx, patchidentityProvider := &IdentityProviderMessage{}var identityProviderType stringvar identityProviderConfig string- if err := txn.QueryRowContext(ctx, query, args...).Scan(+ if err := s.GetDB().QueryRowContext(ctx, query, args...).Scan(&identityProvider.ResourceID,&identityProvider.Title,&identityProvider.Domain,diff --git a/backend/store/query_history.go b/backend/store/query_history.goindex 0b6c9ed410..cac83178e5 100644--- a/backend/store/query_history.go+++ b/backend/store/query_history.go@@ -145,19 +145,13 @@ func (s *Store) ListQueryHistories(ctx context.Context, find *FindQueryHistoryMeq.Space("OFFSET ?", *v)}- sql, args, err := q.ToSQL()+ sqlStr, args, err := q.ToSQL()if err != nil {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 queryHistories []*QueryHistoryMessage- rows, err := tx.QueryContext(ctx, sql, args...)+ rows, err := s.GetDB().QueryContext(ctx, sqlStr, args...)if err != nil {return nil, err}@@ -191,10 +185,6 @@ func (s *Store) ListQueryHistories(ctx context.Context, find *FindQueryHistoryMereturn nil, err}- if err := tx.Commit(); err != nil {- return nil, err- }-return queryHistories, nil}diff --git a/backend/store/release.go b/backend/store/release.goindex f4ee6da3c3..02c83c31e7 100644--- a/backend/store/release.go+++ b/backend/store/release.go@@ -177,13 +177,7 @@ func (s *Store) ListReleases(ctx context.Context, find *FindReleaseMessage) ([]*return nil, errors.Wrapf(err, "failed to build sql")}- tx, err := s.GetDB().BeginTx(ctx, &sql.TxOptions{ReadOnly: true})- if err != nil {- return nil, errors.Wrapf(err, "failed to begin tx")- }- defer tx.Rollback()-- rows, err := tx.QueryContext(ctx, query, args...)+ rows, err := s.GetDB().QueryContext(ctx, query, args...)if err != nil {return nil, errors.Wrapf(err, "failed to query rows")}@@ -221,10 +215,6 @@ func (s *Store) ListReleases(ctx context.Context, find *FindReleaseMessage) ([]*return nil, errors.Wrapf(err, "rows err")}- if err := tx.Commit(); err != nil {- return nil, errors.Wrapf(err, "failed to commit tx")- }-return releases, nil}diff --git a/backend/store/review_config.go b/backend/store/review_config.goindex de42fcc2b1..7b6a360199 100644--- a/backend/store/review_config.go+++ b/backend/store/review_config.go@@ -70,13 +70,7 @@ func (s *Store) ListReviewConfigs(ctx context.Context, find *FindReviewConfigMesreturn nil, errors.Wrapf(err, "failed to build sql")}- 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}@@ -107,9 +101,6 @@ func (s *Store) ListReviewConfigs(ctx context.Context, find *FindReviewConfigMesif err := rows.Err(); err != nil {return nil, err}- if err := tx.Commit(); err != nil {- return nil, err- }return sqlReviewList, nil}diff --git a/backend/store/revision.go b/backend/store/revision.goindex effb5070c0..729c4908c8 100644--- a/backend/store/revision.go+++ b/backend/store/revision.go@@ -2,7 +2,6 @@ package storeimport ("context"- "database/sql""time""github.com/pkg/errors"@@ -92,13 +91,7 @@ func (s *Store) ListRevisions(ctx context.Context, find *FindRevisionMessage) ([return nil, errors.Wrapf(err, "failed to build sql")}- tx, err := s.GetDB().BeginTx(ctx, &sql.TxOptions{ReadOnly: true})- if err != nil {- return nil, errors.Wrapf(err, "failed to begin tx")- }- defer tx.Rollback()-- rows, err := tx.QueryContext(ctx, query, args...)+ rows, err := s.GetDB().QueryContext(ctx, query, args...)if err != nil {return nil, errors.Wrapf(err, "failed to query context")}@@ -134,10 +127,6 @@ func (s *Store) ListRevisions(ctx context.Context, find *FindRevisionMessage) ([return nil, errors.Wrapf(err, "rows err")}- if err := tx.Commit(); err != nil {- return nil, errors.Wrapf(err, "failed to commit tx")- }-return revisions, nil}diff --git a/backend/store/setting.go b/backend/store/setting.goindex a2fbefede8..79e38c4998 100644--- a/backend/store/setting.go+++ b/backend/store/setting.go@@ -238,12 +238,6 @@ func (s *Store) GetSetting(ctx context.Context, name storepb.SettingName) (*Sett// ListSettings returns a list of settings.func (s *Store) ListSettings(ctx context.Context, find *FindSettingMessage) ([]*SettingMessage, error) {- 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()-q := qb.Q().Space(`SELECTname,@@ -258,7 +252,7 @@ func (s *Store) ListSettings(ctx context.Context, find *FindSettingMessage) ([]*if err != nil {return nil, errors.Wrapf(err, "failed to build sql")}- rows, err := tx.QueryContext(ctx, query, args...)+ rows, err := s.GetDB().QueryContext(ctx, query, args...)if err != nil {return nil, err}@@ -296,10 +290,6 @@ func (s *Store) ListSettings(ctx context.Context, find *FindSettingMessage) ([]*return nil, err}- if err := tx.Commit(); err != nil {- return nil, errors.Wrap(err, "failed to commit transaction")- }-for _, setting := range settingMessages {s.settingCache.Add(setting.Name, setting)}diff --git a/backend/store/task.go b/backend/store/task.goindex c6de4d78f5..7d8f7b4a90 100644--- a/backend/store/task.go+++ b/backend/store/task.go@@ -232,7 +232,7 @@ func (*Store) createTasksTx(ctx context.Context, txn *sql.Tx, creates ...*TaskMereturn tasks, nil}-func (*Store) listTasksTx(ctx context.Context, txn *sql.Tx, find *TaskFind) ([]*TaskMessage, error) {+func (*Store) listTasksImpl(ctx context.Context, txn *sql.Tx, find *TaskFind) ([]*TaskMessage, error) {q := qb.Q().Space(`SELECTtask.id,@@ -355,7 +355,7 @@ func (s *Store) ListTasks(ctx context.Context, find *TaskFind) ([]*TaskMessage,}defer tx.Rollback()- tasks, err := s.listTasksTx(ctx, tx, find)+ tasks, err := s.listTasksImpl(ctx, tx, find)if err != nil {return nil, errors.Wrapf(err, "failed to list tasks")}@@ -393,7 +393,7 @@ func (s *Store) CreateTasks(ctx context.Context, planUID int64, tasks []*TaskMesdefer tx.Rollback()// Check existing tasks to avoid duplicates- existingTasks, err := s.listTasksTx(ctx, tx, &TaskFind{+ existingTasks, err := s.listTasksImpl(ctx, tx, &TaskFind{PlanID: &planUID,})if err != nil {