Skip to content

Use db.WithTx/WithTx2 instead of TxContext when possible #35428

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

Merged
merged 4 commits into from
Sep 10, 2025
Merged

Use db.WithTx/WithTx2 instead of TxContext when possible #35428

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
312ba91
Use db.WithTx/WithTx2 instead of TxContext when possible
lunny Sep 7, 2025
f38464a
Merge branch 'main' into lunny/move_db_tx
lunny Sep 7, 2025
88caa67
Merge branch 'main' into lunny/move_db_tx
lunny Sep 9, 2025
3b6f050
Merge branch 'main' into lunny/move_db_tx
GiteaBot Sep 10, 2025
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
12 changes: 3 additions & 9 deletions models/asymkey/gpg_key_add.go
View file
Open in desktop
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -72,12 +72,7 @@ func AddGPGKey(ctx context.Context, ownerID int64, content, token, signature str
return nil, err return nil, err
} }


ctx, committer, err := db.TxContext(ctx) return db.WithTx2(ctx, func(ctx context.Context) ([]*GPGKey, error) {
if err != nil {
return nil, err
}
defer committer.Close()

keys := make([]*GPGKey, 0, len(ekeys)) keys := make([]*GPGKey, 0, len(ekeys))


verified := false verified := false
Expand Down Expand Up @@ -151,8 +146,6 @@ func AddGPGKey(ctx context.Context, ownerID int64, content, token, signature str
return nil, ErrGPGKeyIDAlreadyUsed{ekey.PrimaryKey.KeyIdString()} return nil, ErrGPGKeyIDAlreadyUsed{ekey.PrimaryKey.KeyIdString()}
} }


// Get DB session

key, err := parseGPGKey(ctx, ownerID, ekey, verified) key, err := parseGPGKey(ctx, ownerID, ekey, verified)
if err != nil { if err != nil {
return nil, err return nil, err
Expand All @@ -163,5 +156,6 @@ func AddGPGKey(ctx context.Context, ownerID int64, content, token, signature str
} }
keys = append(keys, key) keys = append(keys, key)
} }
return keys, committer.Commit() return keys, nil
})
} }
23 changes: 6 additions & 17 deletions models/git/branch.go
View file
Open in desktop
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -334,12 +334,7 @@ func FindRenamedBranch(ctx context.Context, repoID int64, from string) (branch *


// RenameBranch rename a branch // RenameBranch rename a branch
func RenameBranch(ctx context.Context, repo *repo_model.Repository, from, to string, gitAction func(ctx context.Context, isDefault bool) error) (err error) { func RenameBranch(ctx context.Context, repo *repo_model.Repository, from, to string, gitAction func(ctx context.Context, isDefault bool) error) (err error) {
ctx, committer, err := db.TxContext(ctx) return db.WithTx(ctx, func(ctx context.Context) error {
if err != nil {
return err
}
defer committer.Close()

sess := db.GetEngine(ctx) sess := db.GetEngine(ctx)


// check whether from branch exist // check whether from branch exist
Expand Down Expand Up @@ -403,8 +398,7 @@ func RenameBranch(ctx context.Context, repo *repo_model.Repository, from, to str
if protectedBranch != nil { if protectedBranch != nil {
// there is a protect rule for this branch // there is a protect rule for this branch
protectedBranch.RuleName = to protectedBranch.RuleName = to
_, err = sess.ID(protectedBranch.ID).Cols("branch_name").Update(protectedBranch) if _, err = sess.ID(protectedBranch.ID).Cols("branch_name").Update(protectedBranch); err != nil {
if err != nil {
return err return err
} }
} else { } else {
Expand Down Expand Up @@ -434,22 +428,17 @@ func RenameBranch(ctx context.Context, repo *repo_model.Repository, from, to str
} }


// 5. insert renamed branch record // 5. insert renamed branch record
renamedBranch := &RenamedBranch{ if err = db.Insert(ctx, &RenamedBranch{
RepoID: repo.ID, RepoID: repo.ID,
From: from, From: from,
To: to, To: to,
} }); err != nil {
err = db.Insert(ctx, renamedBranch)
if err != nil {
return err return err
} }


// 6. do git action // 6. do git action
if err = gitAction(ctx, isDefault); err != nil { return gitAction(ctx, isDefault)
return err })
}

return committer.Commit()
} }


type FindRecentlyPushedNewBranchesOptions struct { type FindRecentlyPushedNewBranchesOptions struct {
Expand Down
36 changes: 11 additions & 25 deletions models/git/lfs.go
View file
Open in desktop
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -180,12 +180,7 @@ func RemoveLFSMetaObjectByOidFn(ctx context.Context, repoID int64, oid string, f
return 0, ErrLFSObjectNotExist return 0, ErrLFSObjectNotExist
} }


ctx, committer, err := db.TxContext(ctx) return db.WithTx2(ctx, func(ctx context.Context) (int64, error) {
if err != nil {
return 0, err
}
defer committer.Close()

m := &LFSMetaObject{Pointer: lfs.Pointer{Oid: oid}, RepositoryID: repoID} m := &LFSMetaObject{Pointer: lfs.Pointer{Oid: oid}, RepositoryID: repoID}
if _, err := db.DeleteByBean(ctx, m); err != nil { if _, err := db.DeleteByBean(ctx, m); err != nil {
return -1, err return -1, err
Expand All @@ -202,7 +197,8 @@ func RemoveLFSMetaObjectByOidFn(ctx context.Context, repoID int64, oid string, f
} }
} }


return count, committer.Commit() return count, nil
})
} }


// GetLFSMetaObjects returns all LFSMetaObjects associated with a repository // GetLFSMetaObjects returns all LFSMetaObjects associated with a repository
Expand Down Expand Up @@ -243,14 +239,7 @@ func ExistsLFSObject(ctx context.Context, oid string) (bool, error) {


// LFSAutoAssociate auto associates accessible LFSMetaObjects // LFSAutoAssociate auto associates accessible LFSMetaObjects
func LFSAutoAssociate(ctx context.Context, metas []*LFSMetaObject, user *user_model.User, repoID int64) error { func LFSAutoAssociate(ctx context.Context, metas []*LFSMetaObject, user *user_model.User, repoID int64) error {
ctx, committer, err := db.TxContext(ctx) return db.WithTx(ctx, func(ctx context.Context) error {
if err != nil {
return err
}
defer committer.Close()

sess := db.GetEngine(ctx)

oids := make([]any, len(metas)) oids := make([]any, len(metas))
oidMap := make(map[string]*LFSMetaObject, len(metas)) oidMap := make(map[string]*LFSMetaObject, len(metas))
for i, meta := range metas { for i, meta := range metas {
Expand All @@ -264,8 +253,7 @@ func LFSAutoAssociate(ctx context.Context, metas []*LFSMetaObject, user *user_mo
"`lfs_meta_object`.repository_id", "`lfs_meta_object`.repository_id",
builder.Select("`repository`.id").From("repository").Where(repo_model.AccessibleRepositoryCondition(user, unit.TypeInvalid)), builder.Select("`repository`.id").From("repository").Where(repo_model.AccessibleRepositoryCondition(user, unit.TypeInvalid)),
) )
err = sess.Cols("oid").Where(cond).In("oid", oids...).GroupBy("oid").Find(&newMetas) if err := db.GetEngine(ctx).Cols("oid").Where(cond).In("oid", oids...).GroupBy("oid").Find(&newMetas); err != nil {
if err != nil {
return err return err
} }
if len(newMetas) != len(oidMap) { if len(newMetas) != len(oidMap) {
Expand All @@ -275,24 +263,22 @@ func LFSAutoAssociate(ctx context.Context, metas []*LFSMetaObject, user *user_mo
newMetas[i].Size = oidMap[newMetas[i].Oid].Size newMetas[i].Size = oidMap[newMetas[i].Oid].Size
newMetas[i].RepositoryID = repoID newMetas[i].RepositoryID = repoID
} }
if err = db.Insert(ctx, newMetas); err != nil { return db.Insert(ctx, newMetas)
return err
} }
} else {
// admin can associate any LFS object to any repository, and we do not care about errors (eg: duplicated unique key), // admin can associate any LFS object to any repository, and we do not care about errors (eg: duplicated unique key),
// even if error occurs, it won't hurt users and won't make things worse // even if error occurs, it won't hurt users and won't make things worse
for i := range metas { for i := range metas {
p := lfs.Pointer{Oid: metas[i].Oid, Size: metas[i].Size} p := lfs.Pointer{Oid: metas[i].Oid, Size: metas[i].Size}
_, err = sess.Insert(&LFSMetaObject{ if err := db.Insert(ctx, &LFSMetaObject{
Pointer: p, Pointer: p,
RepositoryID: repoID, RepositoryID: repoID,
}) }); err != nil {
if err != nil {
log.Warn("failed to insert LFS meta object %-v for repo_id: %d into database, err=%v", p, repoID, err) log.Warn("failed to insert LFS meta object %-v for repo_id: %d into database, err=%v", p, repoID, err)
} }
} }
} return nil
return committer.Commit() })
} }


// CopyLFS copies LFS data from one repo to another // CopyLFS copies LFS data from one repo to another
Expand Down
14 changes: 3 additions & 11 deletions models/issues/assignees.go
View file
Open in desktop
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -91,18 +91,10 @@ func GetAssignedIssues(ctx context.Context, opts *AssignedIssuesOptions) ([]*Iss


// ToggleIssueAssignee changes a user between assigned and not assigned for this issue, and make issue comment for it. // ToggleIssueAssignee changes a user between assigned and not assigned for this issue, and make issue comment for it.
func ToggleIssueAssignee(ctx context.Context, issue *Issue, doer *user_model.User, assigneeID int64) (removed bool, comment *Comment, err error) { func ToggleIssueAssignee(ctx context.Context, issue *Issue, doer *user_model.User, assigneeID int64) (removed bool, comment *Comment, err error) {
ctx, committer, err := db.TxContext(ctx) if err := db.WithTx(ctx, func(ctx context.Context) error {
if err != nil {
return false, nil, err
}
defer committer.Close()

removed, comment, err = toggleIssueAssignee(ctx, issue, doer, assigneeID, false) removed, comment, err = toggleIssueAssignee(ctx, issue, doer, assigneeID, false)
if err != nil { return err
return false, nil, err }); err != nil {
}

if err := committer.Commit(); err != nil {
return false, nil, err return false, nil, err
} }


Expand Down
13 changes: 2 additions & 11 deletions models/issues/issue_update.go
View file
Open in desktop
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -415,12 +415,7 @@ func NewIssueWithIndex(ctx context.Context, doer *user_model.User, opts NewIssue
// NewIssue creates new issue with labels for repository. // NewIssue creates new issue with labels for repository.
// The title will be cut off at 255 characters if it's longer than 255 characters. // The title will be cut off at 255 characters if it's longer than 255 characters.
func NewIssue(ctx context.Context, repo *repo_model.Repository, issue *Issue, labelIDs []int64, uuids []string) (err error) { func NewIssue(ctx context.Context, repo *repo_model.Repository, issue *Issue, labelIDs []int64, uuids []string) (err error) {
ctx, committer, err := db.TxContext(ctx) return db.WithTx(ctx, func(ctx context.Context) error {
if err != nil {
return err
}
defer committer.Close()

idx, err := db.GetNextResourceIndex(ctx, "issue_index", repo.ID) idx, err := db.GetNextResourceIndex(ctx, "issue_index", repo.ID)
if err != nil { if err != nil {
return fmt.Errorf("generate issue index failed: %w", err) return fmt.Errorf("generate issue index failed: %w", err)
Expand All @@ -440,12 +435,8 @@ func NewIssue(ctx context.Context, repo *repo_model.Repository, issue *Issue, la
} }
return fmt.Errorf("newIssue: %w", err) return fmt.Errorf("newIssue: %w", err)
} }

if err = committer.Commit(); err != nil {
return fmt.Errorf("Commit: %w", err)
}

return nil return nil
})
} }


// UpdateIssueMentions updates issue-user relations for mentioned users. // UpdateIssueMentions updates issue-user relations for mentioned users.
Expand Down
11 changes: 3 additions & 8 deletions models/user/email_address.go
View file
Open in desktop
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -442,12 +442,7 @@ func SearchEmails(ctx context.Context, opts *SearchEmailOptions) ([]*SearchEmail
// ActivateUserEmail will change the activated state of an email address, // ActivateUserEmail will change the activated state of an email address,
// either primary or secondary (all in the email_address table) // either primary or secondary (all in the email_address table)
func ActivateUserEmail(ctx context.Context, userID int64, email string, activate bool) (err error) { func ActivateUserEmail(ctx context.Context, userID int64, email string, activate bool) (err error) {
ctx, committer, err := db.TxContext(ctx) return db.WithTx(ctx, func(ctx context.Context) error {
if err != nil {
return err
}
defer committer.Close()

// Activate/deactivate a user's secondary email address // Activate/deactivate a user's secondary email address
// First check if there's another user active with the same address // First check if there's another user active with the same address
addr, exist, err := db.Get[EmailAddress](ctx, builder.Eq{"uid": userID, "lower_email": strings.ToLower(email)}) addr, exist, err := db.Get[EmailAddress](ctx, builder.Eq{"uid": userID, "lower_email": strings.ToLower(email)})
Expand Down Expand Up @@ -492,8 +487,8 @@ func ActivateUserEmail(ctx context.Context, userID int64, email string, activate
} }
} }
} }

return nil
return committer.Commit() })
} }


// validateEmailBasic checks whether the email complies with the rules // validateEmailBasic checks whether the email complies with the rules
Expand Down
16 changes: 4 additions & 12 deletions models/user/user.go
View file
Open in desktop
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -716,12 +716,7 @@ func createUser(ctx context.Context, u *User, meta *Meta, createdByAdmin bool, o
} }
} }


ctx, committer, err := db.TxContext(ctx) return db.WithTx(ctx, func(ctx context.Context) error {
if err != nil {
return err
}
defer committer.Close()

isExist, err := IsUserExist(ctx, 0, u.Name) isExist, err := IsUserExist(ctx, 0, u.Name)
if err != nil { if err != nil {
return err return err
Expand Down Expand Up @@ -789,17 +784,14 @@ func createUser(ctx context.Context, u *User, meta *Meta, createdByAdmin bool, o
} }


// insert email address // insert email address
if err := db.Insert(ctx, &EmailAddress{ return db.Insert(ctx, &EmailAddress{
UID: u.ID, UID: u.ID,
Email: u.Email, Email: u.Email,
LowerEmail: strings.ToLower(u.Email), LowerEmail: strings.ToLower(u.Email),
IsActivated: u.IsActive, IsActivated: u.IsActive,
IsPrimary: true, IsPrimary: true,
}); err != nil { })
return err })
}

return committer.Commit()
} }


// ErrDeleteLastAdminUser represents a "DeleteLastAdminUser" kind of error. // ErrDeleteLastAdminUser represents a "DeleteLastAdminUser" kind of error.
Expand Down
11 changes: 2 additions & 9 deletions services/issue/issue.go
View file
Open in desktop
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -261,12 +261,7 @@ func GetRefEndNamesAndURLs(issues []*issues_model.Issue, repoLink string) (map[i


// deleteIssue deletes the issue // deleteIssue deletes the issue
func deleteIssue(ctx context.Context, issue *issues_model.Issue) ([]string, error) { func deleteIssue(ctx context.Context, issue *issues_model.Issue) ([]string, error) {
ctx, committer, err := db.TxContext(ctx) return db.WithTx2(ctx, func(ctx context.Context) ([]string, error) {
if err != nil {
return nil, err
}
defer committer.Close()

if _, err := db.GetEngine(ctx).ID(issue.ID).NoAutoCondition().Delete(issue); err != nil { if _, err := db.GetEngine(ctx).ID(issue.ID).NoAutoCondition().Delete(issue); err != nil {
return nil, err return nil, err
} }
Expand Down Expand Up @@ -325,10 +320,8 @@ func deleteIssue(ctx context.Context, issue *issues_model.Issue) ([]string, erro
return nil, err return nil, err
} }


if err := committer.Commit(); err != nil {
return nil, err
}
return attachmentPaths, nil return attachmentPaths, nil
})
} }


// DeleteOrphanedIssues delete issues without a repo // DeleteOrphanedIssues delete issues without a repo
Expand Down
11 changes: 3 additions & 8 deletions services/org/org.go
View file
Open in desktop
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -52,12 +52,7 @@ func deleteOrganization(ctx context.Context, org *org_model.Organization) error


// DeleteOrganization completely and permanently deletes everything of organization. // DeleteOrganization completely and permanently deletes everything of organization.
func DeleteOrganization(ctx context.Context, org *org_model.Organization, purge bool) error { func DeleteOrganization(ctx context.Context, org *org_model.Organization, purge bool) error {
ctx, committer, err := db.TxContext(ctx) if err := db.WithTx(ctx, func(ctx context.Context) error {
if err != nil {
return err
}
defer committer.Close()

if purge { if purge {
err := repo_service.DeleteOwnerRepositoriesDirectly(ctx, org.AsUser()) err := repo_service.DeleteOwnerRepositoriesDirectly(ctx, org.AsUser())
if err != nil { if err != nil {
Expand All @@ -83,8 +78,8 @@ func DeleteOrganization(ctx context.Context, org *org_model.Organization, purge
if err := deleteOrganization(ctx, org); err != nil { if err := deleteOrganization(ctx, org); err != nil {
return fmt.Errorf("DeleteOrganization: %w", err) return fmt.Errorf("DeleteOrganization: %w", err)
} }

return nil
if err := committer.Commit(); err != nil { }); err != nil {
return err return err
} }


Expand Down
11 changes: 3 additions & 8 deletions services/org/user.go
View file
Open in desktop
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -47,12 +47,7 @@ func RemoveOrgUser(ctx context.Context, org *organization.Organization, user *us
} }
} }


ctx, committer, err := db.TxContext(ctx) return db.WithTx(ctx, func(ctx context.Context) error {
if err != nil {
return err
}
defer committer.Close()

if _, err := db.DeleteByID[organization.OrgUser](ctx, ou.ID); err != nil { if _, err := db.DeleteByID[organization.OrgUser](ctx, ou.ID); err != nil {
return err return err
} else if _, err = db.Exec(ctx, "UPDATE `user` SET num_members=num_members-1 WHERE id=?", org.ID); err != nil { } else if _, err = db.Exec(ctx, "UPDATE `user` SET num_members=num_members-1 WHERE id=?", org.ID); err != nil {
Expand Down Expand Up @@ -98,6 +93,6 @@ func RemoveOrgUser(ctx context.Context, org *organization.Organization, user *us
return err return err
} }
} }

return nil
return committer.Commit() })
} }
11 changes: 3 additions & 8 deletions services/release/release.go
View file
Open in desktop
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -267,18 +267,13 @@ func UpdateRelease(ctx context.Context, doer *user_model.User, gitRepo *git.Repo
} }
rel.LowerTagName = strings.ToLower(rel.TagName) rel.LowerTagName = strings.ToLower(rel.TagName)


ctx, committer, err := db.TxContext(ctx)
if err != nil {
return err
}
defer committer.Close()

oldRelease, err := repo_model.GetReleaseByID(ctx, rel.ID) oldRelease, err := repo_model.GetReleaseByID(ctx, rel.ID)
if err != nil { if err != nil {
return err return err
} }
isConvertedFromTag := oldRelease.IsTag && !rel.IsTag isConvertedFromTag := oldRelease.IsTag && !rel.IsTag


if err := db.WithTx(ctx, func(ctx context.Context) error {
if err = repo_model.UpdateRelease(ctx, rel); err != nil { if err = repo_model.UpdateRelease(ctx, rel); err != nil {
return err return err
} }
Expand Down Expand Up @@ -333,8 +328,8 @@ func UpdateRelease(ctx context.Context, doer *user_model.User, gitRepo *git.Repo
} }
} }
} }

return nil
if err := committer.Commit(); err != nil { }); err != nil {
return err return err
} }


Expand Down
Loading