Skip to content

Commit b2f828d

Browse files
authored
refactor: make db iterate context aware (#27710)
the iteration will run until finished atm. this changes it by checking if if the context got canceled before each run of a loop sequence is executed [View this pull with now whitespace](https://github.com/go-gitea/gitea/pull/27710/files?diff=unified&w=1)
1 parent 510d075 commit b2f828d

File tree

2 files changed

+39
-29
lines changed

2 files changed

+39
-29
lines changed

models/db/iterate.go

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -17,22 +17,27 @@ func Iterate[Bean any](ctx context.Context, cond builder.Cond, f func(ctx contex
1717
batchSize := setting.Database.IterateBufferSize
1818
sess := GetEngine(ctx)
1919
for {
20-
beans := make([]*Bean, 0, batchSize)
21-
if cond != nil {
22-
sess = sess.Where(cond)
23-
}
24-
if err := sess.Limit(batchSize, start).Find(&beans); err != nil {
25-
return err
26-
}
27-
if len(beans) == 0 {
28-
return nil
29-
}
30-
start += len(beans)
31-
32-
for _, bean := range beans {
33-
if err := f(ctx, bean); err != nil {
20+
select {
21+
case <-ctx.Done():
22+
return ctx.Err()
23+
default:
24+
beans := make([]*Bean, 0, batchSize)
25+
if cond != nil {
26+
sess = sess.Where(cond)
27+
}
28+
if err := sess.Limit(batchSize, start).Find(&beans); err != nil {
3429
return err
3530
}
31+
if len(beans) == 0 {
32+
return nil
33+
}
34+
start += len(beans)
35+
36+
for _, bean := range beans {
37+
if err := f(ctx, bean); err != nil {
38+
return err
39+
}
40+
}
3641
}
3742
}
3843
}

modules/doctor/repository.go

Lines changed: 20 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -37,24 +37,29 @@ func deleteOrphanedRepos(ctx context.Context) (int64, error) {
3737
adminUser := &user_model.User{IsAdmin: true}
3838

3939
for {
40-
var ids []int64
41-
if err := e.Table("`repository`").
42-
Join("LEFT", "`user`", "repository.owner_id=user.id").
43-
Where(builder.IsNull{"`user`.id"}).
44-
Select("`repository`.id").Limit(batchSize).Find(&ids); err != nil {
45-
return deleted, err
46-
}
40+
select {
41+
case <-ctx.Done():
42+
return deleted, ctx.Err()
43+
default:
44+
var ids []int64
45+
if err := e.Table("`repository`").
46+
Join("LEFT", "`user`", "repository.owner_id=user.id").
47+
Where(builder.IsNull{"`user`.id"}).
48+
Select("`repository`.id").Limit(batchSize).Find(&ids); err != nil {
49+
return deleted, err
50+
}
4751

48-
// if we don't get ids we have deleted them all
49-
if len(ids) == 0 {
50-
return deleted, nil
51-
}
52+
// if we don't get ids we have deleted them all
53+
if len(ids) == 0 {
54+
return deleted, nil
55+
}
5256

53-
for _, id := range ids {
54-
if err := repo_service.DeleteRepositoryDirectly(ctx, adminUser, id, true); err != nil {
55-
return deleted, err
57+
for _, id := range ids {
58+
if err := repo_service.DeleteRepositoryDirectly(ctx, adminUser, id, true); err != nil {
59+
return deleted, err
60+
}
61+
deleted++
5662
}
57-
deleted++
5863
}
5964
}
6065
}

0 commit comments

Comments
 (0)