Skip to content

Commit 6db387a

Browse files
lafrikslunny
lafriks
authored and
lunny
committed
Refactor session close as xorm already does everything needed internally (#2020)
1 parent 754482b commit 6db387a

23 files changed

+60
-74
lines changed

‎models/attachment.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ func (a *Attachment) AfterSet(colName string, _ xorm.Cell) {
4848
// IncreaseDownloadCount is update download count + 1
4949
func (a *Attachment) IncreaseDownloadCount() error {
5050
sess := x.NewSession()
51-
defer sessionRelease(sess)
51+
defer sess.Close()
5252

5353
// Update download count.
5454
if _, err := sess.Exec("UPDATE `attachment` SET download_count=download_count+1 WHERE id=?", a.ID); err != nil {

‎models/branches.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ func (repo *Repository) AddProtectedBranch(branchName string, canPush bool) erro
9595
}
9696

9797
sess := x.NewSession()
98-
defer sessionRelease(sess)
98+
defer sess.Close()
9999
if err = sess.Begin(); err != nil {
100100
return err
101101
}
@@ -126,7 +126,7 @@ func (repo *Repository) ChangeProtectedBranch(id int64, canPush bool) error {
126126
ProtectedBranch.CanPush = canPush
127127

128128
sess := x.NewSession()
129-
defer sessionRelease(sess)
129+
defer sess.Close()
130130
if err = sess.Begin(); err != nil {
131131
return err
132132
}
@@ -146,7 +146,7 @@ func (repo *Repository) DeleteProtectedBranch(id int64) (err error) {
146146
}
147147

148148
sess := x.NewSession()
149-
defer sessionRelease(sess)
149+
defer sess.Close()
150150
if err = sess.Begin(); err != nil {
151151
return err
152152
}

‎models/gpg_key.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ func AddGPGKey(ownerID int64, content string) (*GPGKey, error) {
127127

128128
//Get DB session
129129
sess := x.NewSession()
130-
defer sessionRelease(sess)
130+
defer sess.Close()
131131
if err = sess.Begin(); err != nil {
132132
return nil, err
133133
}
@@ -267,7 +267,7 @@ func DeleteGPGKey(doer *User, id int64) (err error) {
267267
}
268268

269269
sess := x.NewSession()
270-
defer sessionRelease(sess)
270+
defer sess.Close()
271271
if err = sess.Begin(); err != nil {
272272
return err
273273
}

‎models/issue.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -406,7 +406,7 @@ func (issue *Issue) clearLabels(e *xorm.Session, doer *User) (err error) {
406406
// Triggers appropriate WebHooks, if any.
407407
func (issue *Issue) ClearLabels(doer *User) (err error) {
408408
sess := x.NewSession()
409-
defer sessionRelease(sess)
409+
defer sess.Close()
410410
if err = sess.Begin(); err != nil {
411411
return err
412412
}
@@ -470,7 +470,7 @@ func (ts labelSorter) Swap(i, j int) {
470470
// Triggers appropriate WebHooks, if any.
471471
func (issue *Issue) ReplaceLabels(labels []*Label, doer *User) (err error) {
472472
sess := x.NewSession()
473-
defer sessionRelease(sess)
473+
defer sess.Close()
474474
if err = sess.Begin(); err != nil {
475475
return err
476476
}
@@ -598,7 +598,7 @@ func (issue *Issue) changeStatus(e *xorm.Session, doer *User, repo *Repository,
598598
// ChangeStatus changes issue status to open or closed.
599599
func (issue *Issue) ChangeStatus(doer *User, repo *Repository, isClosed bool) (err error) {
600600
sess := x.NewSession()
601-
defer sessionRelease(sess)
601+
defer sess.Close()
602602
if err = sess.Begin(); err != nil {
603603
return err
604604
}
@@ -899,7 +899,7 @@ func newIssue(e *xorm.Session, doer *User, opts NewIssueOptions) (err error) {
899899
// NewIssue creates new issue with labels for repository.
900900
func NewIssue(repo *Repository, issue *Issue, labelIDs []int64, uuids []string) (err error) {
901901
sess := x.NewSession()
902-
defer sessionRelease(sess)
902+
defer sess.Close()
903903
if err = sess.Begin(); err != nil {
904904
return err
905905
}

‎models/issue_comment.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -502,7 +502,7 @@ type CreateCommentOptions struct {
502502
// CreateComment creates comment of issue or commit.
503503
func CreateComment(opts *CreateCommentOptions) (comment *Comment, err error) {
504504
sess := x.NewSession()
505-
defer sessionRelease(sess)
505+
defer sess.Close()
506506
if err = sess.Begin(); err != nil {
507507
return nil, err
508508
}
@@ -620,7 +620,7 @@ func UpdateComment(c *Comment) error {
620620
// DeleteComment deletes the comment
621621
func DeleteComment(comment *Comment) error {
622622
sess := x.NewSession()
623-
defer sessionRelease(sess)
623+
defer sess.Close()
624624
if err := sess.Begin(); err != nil {
625625
return err
626626
}

‎models/issue_label.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ func DeleteLabel(repoID, labelID int64) error {
223223
}
224224

225225
sess := x.NewSession()
226-
defer sessionRelease(sess)
226+
defer sess.Close()
227227
if err = sess.Begin(); err != nil {
228228
return err
229229
}
@@ -298,7 +298,7 @@ func NewIssueLabel(issue *Issue, label *Label, doer *User) (err error) {
298298
}
299299

300300
sess := x.NewSession()
301-
defer sessionRelease(sess)
301+
defer sess.Close()
302302
if err = sess.Begin(); err != nil {
303303
return err
304304
}
@@ -327,7 +327,7 @@ func newIssueLabels(e *xorm.Session, issue *Issue, labels []*Label, doer *User)
327327
// NewIssueLabels creates a list of issue-label relations.
328328
func NewIssueLabels(issue *Issue, labels []*Label, doer *User) (err error) {
329329
sess := x.NewSession()
330-
defer sessionRelease(sess)
330+
defer sess.Close()
331331
if err = sess.Begin(); err != nil {
332332
return err
333333
}
@@ -375,7 +375,7 @@ func deleteIssueLabel(e *xorm.Session, issue *Issue, label *Label, doer *User) (
375375
// DeleteIssueLabel deletes issue-label relation.
376376
func DeleteIssueLabel(issue *Issue, label *Label, doer *User) (err error) {
377377
sess := x.NewSession()
378-
defer sessionRelease(sess)
378+
defer sess.Close()
379379
if err = sess.Begin(); err != nil {
380380
return err
381381
}

‎models/issue_milestone.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ func (m *Milestone) APIFormat() *api.Milestone {
104104
// NewMilestone creates new milestone of repository.
105105
func NewMilestone(m *Milestone) (err error) {
106106
sess := x.NewSession()
107-
defer sessionRelease(sess)
107+
defer sess.Close()
108108
if err = sess.Begin(); err != nil {
109109
return err
110110
}
@@ -215,7 +215,7 @@ func ChangeMilestoneStatus(m *Milestone, isClosed bool) (err error) {
215215
}
216216

217217
sess := x.NewSession()
218-
defer sessionRelease(sess)
218+
defer sess.Close()
219219
if err = sess.Begin(); err != nil {
220220
return err
221221
}
@@ -330,7 +330,7 @@ func DeleteMilestoneByRepoID(repoID, id int64) error {
330330
}
331331

332332
sess := x.NewSession()
333-
defer sessionRelease(sess)
333+
defer sess.Close()
334334
if err = sess.Begin(); err != nil {
335335
return err
336336
}

‎models/issue_user.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ func updateIssueUserByAssignee(e Engine, issue *Issue) (err error) {
6969
// UpdateIssueUserByAssignee updates issue-user relation for assignee.
7070
func UpdateIssueUserByAssignee(issue *Issue) (err error) {
7171
sess := x.NewSession()
72-
defer sessionRelease(sess)
72+
defer sess.Close()
7373
if err = sess.Begin(); err != nil {
7474
return err
7575
}

‎models/lfs.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ func NewLFSMetaObject(m *LFSMetaObject) (*LFSMetaObject, error) {
5656
}
5757

5858
sess := x.NewSession()
59-
defer sessionRelease(sess)
59+
defer sess.Close()
6060
if err = sess.Begin(); err != nil {
6161
return nil, err
6262
}
@@ -94,7 +94,7 @@ func RemoveLFSMetaObjectByOid(oid string) error {
9494
}
9595

9696
sess := x.NewSession()
97-
defer sessionRelease(sess)
97+
defer sess.Close()
9898
if err := sess.Begin(); err != nil {
9999
return err
100100
}

‎models/migrations/migrations.go

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -167,13 +167,6 @@ Please try to upgrade to a lower version (>= v0.6.0) first, then upgrade to curr
167167
return nil
168168
}
169169

170-
func sessionRelease(sess *xorm.Session) {
171-
if !sess.IsCommitedOrRollbacked {
172-
sess.Rollback()
173-
}
174-
sess.Close()
175-
}
176-
177170
func fixLocaleFileLoadPanic(_ *xorm.Engine) error {
178171
cfg, err := ini.Load(setting.CustomConf)
179172
if err != nil {
@@ -214,7 +207,7 @@ func trimCommitActionAppURLPrefix(x *xorm.Engine) error {
214207
}
215208

216209
sess := x.NewSession()
217-
defer sessionRelease(sess)
210+
defer sess.Close()
218211
if err = sess.Begin(); err != nil {
219212
return err
220213
}
@@ -287,7 +280,7 @@ func issueToIssueLabel(x *xorm.Engine) error {
287280
}
288281

289282
sess := x.NewSession()
290-
defer sessionRelease(sess)
283+
defer sess.Close()
291284
if err = sess.Begin(); err != nil {
292285
return err
293286
}
@@ -330,7 +323,7 @@ func attachmentRefactor(x *xorm.Engine) error {
330323
}
331324

332325
sess := x.NewSession()
333-
defer sessionRelease(sess)
326+
defer sess.Close()
334327
if err = sess.Begin(); err != nil {
335328
return err
336329
}
@@ -408,7 +401,7 @@ func renamePullRequestFields(x *xorm.Engine) (err error) {
408401
}
409402

410403
sess := x.NewSession()
411-
defer sessionRelease(sess)
404+
defer sess.Close()
412405
if err = sess.Begin(); err != nil {
413406
return err
414407
}
@@ -492,7 +485,7 @@ func generateOrgRandsAndSalt(x *xorm.Engine) (err error) {
492485
}
493486

494487
sess := x.NewSession()
495-
defer sessionRelease(sess)
488+
defer sess.Close()
496489
if err = sess.Begin(); err != nil {
497490
return err
498491
}

‎models/migrations/v13.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ func ldapUseSSLToSecurityProtocol(x *xorm.Engine) error {
2323
}
2424

2525
sess := x.NewSession()
26-
defer sessionRelease(sess)
26+
defer sess.Close()
2727
if err = sess.Begin(); err != nil {
2828
return err
2929
}

‎models/models.go

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -49,13 +49,6 @@ type Engine interface {
4949
Where(interface{}, ...interface{}) *xorm.Session
5050
}
5151

52-
func sessionRelease(sess *xorm.Session) {
53-
if !sess.IsCommitedOrRollbacked {
54-
sess.Rollback()
55-
}
56-
sess.Close()
57-
}
58-
5952
var (
6053
x *xorm.Engine
6154
tables []interface{}

‎models/org.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ func CreateOrganization(org, owner *User) (err error) {
127127
org.Type = UserTypeOrganization
128128

129129
sess := x.NewSession()
130-
defer sessionRelease(sess)
130+
defer sess.Close()
131131
if err = sess.Begin(); err != nil {
132132
return err
133133
}
@@ -481,7 +481,7 @@ func RemoveOrgUser(orgID, userID int64) error {
481481
}
482482

483483
sess := x.NewSession()
484-
defer sessionRelease(sess)
484+
defer sess.Close()
485485
if err := sess.Begin(); err != nil {
486486
return err
487487
}

‎models/org_team.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ func (t *Team) AddRepository(repo *Repository) (err error) {
119119
}
120120

121121
sess := x.NewSession()
122-
defer sessionRelease(sess)
122+
defer sess.Close()
123123
if err = sess.Begin(); err != nil {
124124
return err
125125
}
@@ -180,7 +180,7 @@ func (t *Team) RemoveRepository(repoID int64) error {
180180
}
181181

182182
sess := x.NewSession()
183-
defer sessionRelease(sess)
183+
defer sess.Close()
184184
if err = sess.Begin(); err != nil {
185185
return err
186186
}
@@ -309,7 +309,7 @@ func UpdateTeam(t *Team, authChanged bool) (err error) {
309309
}
310310

311311
sess := x.NewSession()
312-
defer sessionRelease(sess)
312+
defer sess.Close()
313313
if err = sess.Begin(); err != nil {
314314
return err
315315
}
@@ -354,7 +354,7 @@ func DeleteTeam(t *Team) error {
354354
}
355355

356356
sess := x.NewSession()
357-
defer sessionRelease(sess)
357+
defer sess.Close()
358358
if err := sess.Begin(); err != nil {
359359
return err
360360
}
@@ -482,7 +482,7 @@ func AddTeamMember(team *Team, userID int64) error {
482482
}
483483

484484
sess := x.NewSession()
485-
defer sessionRelease(sess)
485+
defer sess.Close()
486486
if err := sess.Begin(); err != nil {
487487
return err
488488
}
@@ -584,7 +584,7 @@ func removeTeamMember(e Engine, team *Team, userID int64) error {
584584
// RemoveTeamMember removes member from given team of given organization.
585585
func RemoveTeamMember(team *Team, userID int64) error {
586586
sess := x.NewSession()
587-
defer sessionRelease(sess)
587+
defer sess.Close()
588588
if err := sess.Begin(); err != nil {
589589
return err
590590
}

‎models/pull.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -406,7 +406,7 @@ func (pr *PullRequest) setMerged() (err error) {
406406
pr.HasMerged = true
407407

408408
sess := x.NewSession()
409-
defer sessionRelease(sess)
409+
defer sess.Close()
410410
if err = sess.Begin(); err != nil {
411411
return err
412412
}
@@ -602,7 +602,7 @@ func (pr *PullRequest) testPatch() (err error) {
602602
// NewPullRequest creates new pull request with labels for repository.
603603
func NewPullRequest(repo *Repository, pull *Issue, labelIDs []int64, uuids []string, pr *PullRequest, patch []byte) (err error) {
604604
sess := x.NewSession()
605-
defer sessionRelease(sess)
605+
defer sess.Close()
606606
if err = sess.Begin(); err != nil {
607607
return err
608608
}

0 commit comments

Comments
 (0)