Skip to content

Commit fc4680e

Browse files
authored
In PushMirrorsIterate and MirrorsIterate if limit is negative do not set it (#20837)
1 parent 3aa5749 commit fc4680e

File tree

2 files changed

+12
-8
lines changed

2 files changed

+12
-8
lines changed

models/repo/mirror.go

+6-4
Original file line numberDiff line numberDiff line change
@@ -107,12 +107,14 @@ func DeleteMirrorByRepoID(repoID int64) error {
107107

108108
// MirrorsIterate iterates all mirror repositories.
109109
func MirrorsIterate(limit int, f func(idx int, bean interface{}) error) error {
110-
return db.GetEngine(db.DefaultContext).
110+
sess := db.GetEngine(db.DefaultContext).
111111
Where("next_update_unix<=?", time.Now().Unix()).
112112
And("next_update_unix!=0").
113-
OrderBy("updated_unix ASC").
114-
Limit(limit).
115-
Iterate(new(Mirror), f)
113+
OrderBy("updated_unix ASC")
114+
if limit > 0 {
115+
sess = sess.Limit(limit)
116+
}
117+
return sess.Iterate(new(Mirror), f)
116118
}
117119

118120
// InsertMirror inserts a mirror to database

models/repo/pushmirror.go

+6-4
Original file line numberDiff line numberDiff line change
@@ -129,10 +129,12 @@ func GetPushMirrorsSyncedOnCommit(repoID int64) ([]*PushMirror, error) {
129129

130130
// PushMirrorsIterate iterates all push-mirror repositories.
131131
func PushMirrorsIterate(ctx context.Context, limit int, f func(idx int, bean interface{}) error) error {
132-
return db.GetEngine(ctx).
132+
sess := db.GetEngine(ctx).
133133
Where("last_update + (`interval` / ?) <= ?", time.Second, time.Now().Unix()).
134134
And("`interval` != 0").
135-
OrderBy("last_update ASC").
136-
Limit(limit).
137-
Iterate(new(PushMirror), f)
135+
OrderBy("last_update ASC")
136+
if limit > 0 {
137+
sess = sess.Limit(limit)
138+
}
139+
return sess.Iterate(new(PushMirror), f)
138140
}

0 commit comments

Comments
 (0)