mirror of
https://github.com/go-gitea/gitea.git
synced 2026-10-20 18:27:36 +00:00
3058f5ddf9
Several Actions code paths issued one or more queries per listed row. They now load in batch, with unchanged output. - API job list: tasks, steps and runners load in batch - API run list: latest attempts and their trigger users load in batch - Repository runs page: the jobs of all active runs load in one query - Cancelling previous runs and replacing concurrency group entries fetch their jobs in one query Per call with 50 rows on SQLite, base vs head: | Path | Queries | Time | | --- | --- | --- | | API job list | 254 → 6 | 12.9 → 1.9 ms | | API run list | 305 → 207 | 11.7 → 6.2 ms | | Runs page job loading | 100 → 1 | 6.5 → 0.47 ms | | `CancelPreviousJobs` | 546 → 496 | ~120 ms, per-job writes dominate | The remaining run list queries come from per-run repository conversion, which this PR doesn't change. --------- Co-authored-by: Zettat123 <zettat123@gmail.com> Co-authored-by: silverwind <me@silverwind.io>
116 lines
2.8 KiB
Go
116 lines
2.8 KiB
Go
// Copyright 2022 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package actions
|
|
|
|
import (
|
|
"context"
|
|
|
|
"gitea.dev/models/db"
|
|
"gitea.dev/modules/container"
|
|
"gitea.dev/modules/timeutil"
|
|
"gitea.dev/modules/util"
|
|
|
|
"xorm.io/builder"
|
|
)
|
|
|
|
type TaskList []*ActionTask
|
|
|
|
func (tasks TaskList) GetJobIDs() []int64 {
|
|
return container.FilterSlice(tasks, func(t *ActionTask) (int64, bool) {
|
|
return t.JobID, t.JobID != 0
|
|
})
|
|
}
|
|
|
|
func (tasks TaskList) LoadJobs(ctx context.Context) error {
|
|
jobIDs := tasks.GetJobIDs()
|
|
jobs := make(map[int64]*ActionRunJob, len(jobIDs))
|
|
if err := db.GetEngine(ctx).In("id", jobIDs).Find(&jobs); err != nil {
|
|
return err
|
|
}
|
|
for _, t := range tasks {
|
|
if t.JobID > 0 && t.Job == nil {
|
|
t.Job = jobs[t.JobID]
|
|
}
|
|
}
|
|
|
|
// TODO: Replace with "ActionJobList(maps.Values(jobs))" once available
|
|
var jobsList ActionJobList = make([]*ActionRunJob, 0, len(jobs))
|
|
for _, j := range jobs {
|
|
jobsList = append(jobsList, j)
|
|
}
|
|
return jobsList.LoadAttributes(ctx, true)
|
|
}
|
|
|
|
func (tasks TaskList) LoadSteps(ctx context.Context) error {
|
|
taskIDs := container.FilterSlice(tasks, func(task *ActionTask) (int64, bool) {
|
|
return task.ID, task.Steps == nil
|
|
})
|
|
if len(taskIDs) == 0 {
|
|
return nil
|
|
}
|
|
var steps []*ActionTaskStep
|
|
if err := db.GetEngine(ctx).In("task_id", taskIDs).OrderBy("task_id, `index`").Find(&steps); err != nil {
|
|
return err
|
|
}
|
|
stepsByTask := make(map[int64][]*ActionTaskStep, len(taskIDs))
|
|
for _, step := range steps {
|
|
stepsByTask[step.TaskID] = append(stepsByTask[step.TaskID], step)
|
|
}
|
|
for _, task := range tasks {
|
|
if task.Steps == nil {
|
|
task.Steps = util.SliceNilAsEmpty(stepsByTask[task.ID])
|
|
}
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func (tasks TaskList) LoadAttributes(ctx context.Context) error {
|
|
return tasks.LoadJobs(ctx)
|
|
}
|
|
|
|
type FindTaskOptions struct {
|
|
db.ListOptions
|
|
RepoID int64
|
|
JobID int64
|
|
OwnerID int64
|
|
CommitSHA string
|
|
Status Status
|
|
UpdatedBefore timeutil.TimeStamp
|
|
StartedBefore timeutil.TimeStamp
|
|
RunnerID int64
|
|
}
|
|
|
|
func (opts FindTaskOptions) ToConds() builder.Cond {
|
|
cond := builder.NewCond()
|
|
if opts.RepoID > 0 {
|
|
cond = cond.And(builder.Eq{"repo_id": opts.RepoID})
|
|
}
|
|
if opts.JobID > 0 {
|
|
cond = cond.And(builder.Eq{"job_id": opts.JobID})
|
|
}
|
|
if opts.OwnerID > 0 {
|
|
cond = cond.And(builder.Eq{"owner_id": opts.OwnerID})
|
|
}
|
|
if opts.CommitSHA != "" {
|
|
cond = cond.And(builder.Eq{"commit_sha": opts.CommitSHA})
|
|
}
|
|
if opts.Status > StatusUnknown {
|
|
cond = cond.And(builder.Eq{"status": opts.Status})
|
|
}
|
|
if opts.UpdatedBefore > 0 {
|
|
cond = cond.And(builder.Lt{"updated": opts.UpdatedBefore})
|
|
}
|
|
if opts.StartedBefore > 0 {
|
|
cond = cond.And(builder.Lt{"started": opts.StartedBefore})
|
|
}
|
|
if opts.RunnerID > 0 {
|
|
cond = cond.And(builder.Eq{"runner_id": opts.RunnerID})
|
|
}
|
|
return cond
|
|
}
|
|
|
|
func (opts FindTaskOptions) ToOrders() string {
|
|
return "`id` DESC"
|
|
}
|