Skip to content

Commit 11bf886

Browse files
author
Gusted
committed
Replace sync.Map with normal maps
- These maps aren't being used in any kind of concurrent read/write and thus don't need `sync.Map` and can instead use normal maps. - Special thanks to dachary. - Added in: #6290
1 parent e2bbbc4 commit 11bf886

File tree

1 file changed

+19
-35
lines changed

1 file changed

+19
-35
lines changed

services/migrations/gitea_uploader.go

Lines changed: 19 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import (
1212
"os"
1313
"path/filepath"
1414
"strings"
15-
"sync"
1615
"time"
1716

1817
"code.gitea.io/gitea/models"
@@ -42,9 +41,9 @@ type GiteaLocalUploader struct {
4241
repoOwner string
4342
repoName string
4443
repo *repo_model.Repository
45-
labels sync.Map
46-
milestones sync.Map
47-
issues sync.Map
44+
labels map[string]*models.Label
45+
milestones map[string]int64
46+
issues map[int64]*models.Issue
4847
gitRepo *git.Repository
4948
prHeadCache map[string]struct{}
5049
userMap map[int64]int64 // external user id mapping to user id
@@ -59,6 +58,8 @@ func NewGiteaLocalUploader(ctx context.Context, doer *user_model.User, repoOwner
5958
doer: doer,
6059
repoOwner: repoOwner,
6160
repoName: repoName,
61+
milestones: make(map[string]int64),
62+
issues: make(map[int64]*models.Issue),
6263
prHeadCache: make(map[string]struct{}),
6364
userMap: make(map[int64]int64),
6465
prCache: make(map[int64]*models.PullRequest),
@@ -201,7 +202,7 @@ func (g *GiteaLocalUploader) CreateMilestones(milestones ...*base.Milestone) err
201202
}
202203

203204
for _, ms := range mss {
204-
g.milestones.Store(ms.Name, ms.ID)
205+
g.milestones[ms.Name] = ms.ID
205206
}
206207
return nil
207208
}
@@ -223,7 +224,7 @@ func (g *GiteaLocalUploader) CreateLabels(labels ...*base.Label) error {
223224
return err
224225
}
225226
for _, lb := range lbs {
226-
g.labels.Store(lb.Name, lb)
227+
g.labels[lb.Name] = lb
227228
}
228229
return nil
229230
}
@@ -333,19 +334,13 @@ func (g *GiteaLocalUploader) CreateIssues(issues ...*base.Issue) error {
333334
for _, issue := range issues {
334335
var labels []*models.Label
335336
for _, label := range issue.Labels {
336-
lb, ok := g.labels.Load(label.Name)
337+
lb, ok := g.labels[label.Name]
337338
if ok {
338-
labels = append(labels, lb.(*models.Label))
339+
labels = append(labels, lb)
339340
}
340341
}
341342

342-
var milestoneID int64
343-
if issue.Milestone != "" {
344-
milestone, ok := g.milestones.Load(issue.Milestone)
345-
if ok {
346-
milestoneID = milestone.(int64)
347-
}
348-
}
343+
milestoneID := g.milestones[issue.Milestone]
349344

350345
if issue.Created.IsZero() {
351346
if issue.Closed != nil {
@@ -404,7 +399,7 @@ func (g *GiteaLocalUploader) CreateIssues(issues ...*base.Issue) error {
404399
}
405400

406401
for _, is := range iss {
407-
g.issues.Store(is.Index, is)
402+
g.issues[is.Index] = is
408403
}
409404
}
410405

@@ -416,16 +411,14 @@ func (g *GiteaLocalUploader) CreateComments(comments ...*base.Comment) error {
416411
cms := make([]*models.Comment, 0, len(comments))
417412
for _, comment := range comments {
418413
var issue *models.Issue
419-
issueInter, ok := g.issues.Load(comment.IssueIndex)
414+
issue, ok := g.issues[comment.IssueIndex]
420415
if !ok {
421416
var err error
422417
issue, err = models.GetIssueByIndex(g.repo.ID, comment.IssueIndex)
423418
if err != nil {
424419
return err
425420
}
426-
g.issues.Store(comment.IssueIndex, issue)
427-
} else {
428-
issue = issueInter.(*models.Issue)
421+
g.issues[comment.IssueIndex] = issue
429422
}
430423

431424
if comment.Created.IsZero() {
@@ -487,7 +480,7 @@ func (g *GiteaLocalUploader) CreatePullRequests(prs ...*base.PullRequest) error
487480
return err
488481
}
489482
for _, pr := range gprs {
490-
g.issues.Store(pr.Issue.Index, pr.Issue)
483+
g.issues[pr.Issue.Index] = pr.Issue
491484
pull.AddToTaskQueue(pr)
492485
}
493486
return nil
@@ -496,19 +489,13 @@ func (g *GiteaLocalUploader) CreatePullRequests(prs ...*base.PullRequest) error
496489
func (g *GiteaLocalUploader) newPullRequest(pr *base.PullRequest) (*models.PullRequest, error) {
497490
var labels []*models.Label
498491
for _, label := range pr.Labels {
499-
lb, ok := g.labels.Load(label.Name)
492+
lb, ok := g.labels[label.Name]
500493
if ok {
501-
labels = append(labels, lb.(*models.Label))
494+
labels = append(labels, lb)
502495
}
503496
}
504497

505-
var milestoneID int64
506-
if pr.Milestone != "" {
507-
milestone, ok := g.milestones.Load(pr.Milestone)
508-
if ok {
509-
milestoneID = milestone.(int64)
510-
}
511-
}
498+
milestoneID := g.milestones[pr.Milestone]
512499

513500
// download patch file
514501
err := func() error {
@@ -700,18 +687,15 @@ func (g *GiteaLocalUploader) CreateReviews(reviews ...*base.Review) error {
700687
cms := make([]*models.Review, 0, len(reviews))
701688
for _, review := range reviews {
702689
var issue *models.Issue
703-
issueInter, ok := g.issues.Load(review.IssueIndex)
690+
issue, ok := g.issues[review.IssueIndex]
704691
if !ok {
705692
var err error
706693
issue, err = models.GetIssueByIndex(g.repo.ID, review.IssueIndex)
707694
if err != nil {
708695
return err
709696
}
710-
g.issues.Store(review.IssueIndex, issue)
711-
} else {
712-
issue = issueInter.(*models.Issue)
697+
g.issues[review.IssueIndex] = issue
713698
}
714-
715699
if review.CreatedAt.IsZero() {
716700
review.CreatedAt = time.Unix(int64(issue.CreatedUnix), 0)
717701
}

0 commit comments

Comments
 (0)