pub-solar/forgejo
5
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fix wrong migration for email address (#27106)

Browse source 
On Iterate, `sess` should not be used in the closure function body.

Caused by #26952
This commit is contained in:
Lunny Xiao 2023-09-17 11:15:04 +08:00 committed by GitHub
parent ea83c0647c
commit dcf4b9e314
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 70 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

68
models/migrations/v1_21/v276.go
View file

@ -50,8 +50,25 @@ func migratePullMirrors(x *xorm.Engine) error {
return err return err
} }
if err := sess.Iterate(new(Mirror), func(_ int, bean any) error { limit := setting.Database.IterateBufferSize
m := bean.(*Mirror) if limit <= 0 {
limit = 50
}
start := 0
for {
var mirrors []Mirror
if err := sess.Limit(limit, start).Find(&mirrors); err != nil {
return err
}
if len(mirrors) == 0 {
break
}
start += len(mirrors)
for _, m := range mirrors {
remoteAddress, err := getRemoteAddress(sess, m.RepoID, "origin") remoteAddress, err := getRemoteAddress(sess, m.RepoID, "origin")
if err != nil { if err != nil {
return err return err
@ -59,11 +76,20 @@ func migratePullMirrors(x *xorm.Engine) error {
m.RemoteAddress = remoteAddress m.RemoteAddress = remoteAddress
_, err = sess.ID(m.ID).Cols("remote_address").Update(m) if _, err = sess.ID(m.ID).Cols("remote_address").Update(m); err != nil {
return err return err
}); err != nil { }
}
if start%1000 == 0 { // avoid a too big transaction
if err := sess.Commit(); err != nil {
return err return err
} }
if err := sess.Begin(); err != nil {
return err
}
}
}
return sess.Commit() return sess.Commit()
} }
@ -83,8 +109,25 @@ func migratePushMirrors(x *xorm.Engine) error {
return err return err
} }
if err := sess.Iterate(new(PushMirror), func(_ int, bean any) error { limit := setting.Database.IterateBufferSize
m := bean.(*PushMirror) if limit <= 0 {
limit = 50
}
start := 0
for {
var mirrors []PushMirror
if err := sess.Limit(limit, start).Find(&mirrors); err != nil {
return err
}
if len(mirrors) == 0 {
break
}
start += len(mirrors)
for _, m := range mirrors {
remoteAddress, err := getRemoteAddress(sess, m.RepoID, m.RemoteName) remoteAddress, err := getRemoteAddress(sess, m.RepoID, m.RemoteName)
if err != nil { if err != nil {
return err return err
@ -92,11 +135,20 @@ func migratePushMirrors(x *xorm.Engine) error {
m.RemoteAddress = remoteAddress m.RemoteAddress = remoteAddress
_, err = sess.ID(m.ID).Cols("remote_address").Update(m) if _, err = sess.ID(m.ID).Cols("remote_address").Update(m); err != nil {
return err return err
}); err != nil { }
}
if start%1000 == 0 { // avoid a too big transaction
if err := sess.Commit(); err != nil {
return err return err
} }
if err := sess.Begin(); err != nil {
return err
}
}
}
return sess.Commit() return sess.Commit()
} }