lavender-legacy
/
gitea
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Only sync tags after all batches (#9319) 

Signed-off-by: jolheiser <john.olheiser@gmail.com>
release/v1.15
John Olheiser 2019-12-11 00:09:06 -06:00 committed by Lunny Xiao
parent c3d31e5534
commit 3bf5a07537
3 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/migrations/base/uploader.go
View File

@ -11,7 +11,7 @@ type Uploader interface {
CreateRepo(repo *Repository, opts MigrateOptions) error CreateRepo(repo *Repository, opts MigrateOptions) error
CreateTopics(topic ...string) error CreateTopics(topic ...string) error
CreateMilestones(milestones ...*Milestone) error CreateMilestones(milestones ...*Milestone) error
CreateReleases(releases ...*Release) error CreateReleases(syncTags bool, releases ...*Release) error
CreateLabels(labels ...*Label) error CreateLabels(labels ...*Label) error
CreateIssues(issues ...*Issue) error CreateIssues(issues ...*Issue) error
CreateComments(comments ...*Comment) error CreateComments(comments ...*Comment) error

10
modules/migrations/gitea.go
View File

@ -201,7 +201,7 @@ func (g *GiteaLocalUploader) CreateLabels(labels ...*base.Label) error {
} }
// CreateReleases creates releases // CreateReleases creates releases
func (g *GiteaLocalUploader) CreateReleases(releases ...*base.Release) error { func (g *GiteaLocalUploader) CreateReleases(syncTags bool, releases ...*base.Release) error {
var rels = make([]*models.Release, 0, len(releases)) var rels = make([]*models.Release, 0, len(releases))
for _, release := range releases { for _, release := range releases {
var rel = models.Release{ var rel = models.Release{
@ -292,8 +292,12 @@ func (g *GiteaLocalUploader) CreateReleases(releases ...*base.Release) error {
return err return err
} }
// sync tags to releases in database if syncTags {
return models.SyncReleasesWithTags(g.repo, g.gitRepo) // sync tags to releases in database
return models.SyncReleasesWithTags(g.repo, g.gitRepo)
}
return nil
} }
// CreateIssues creates issues // CreateIssues creates issues

10
modules/migrations/migrate.go
View File

@ -161,12 +161,16 @@ func migrateRepository(downloader base.Downloader, uploader base.Uploader, opts
} }
relBatchSize := uploader.MaxBatchInsertSize("release") relBatchSize := uploader.MaxBatchInsertSize("release")
syncTags := false
for len(releases) > 0 { for len(releases) > 0 {
if len(releases) < relBatchSize { if len(releases) <= relBatchSize {
relBatchSize = len(releases) if len(releases) < relBatchSize {
relBatchSize = len(releases)
}
syncTags = true
} }
if err := uploader.CreateReleases(releases[:relBatchSize]...); err != nil { if err := uploader.CreateReleases(syncTags, releases[:relBatchSize]...); err != nil {
return err return err
} }
releases = releases[relBatchSize:] releases = releases[relBatchSize:]