git724/forgejo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Fix unconditional DB queries in commit status fetches

Browse source
This commit is contained in:
Mathieu Fenniak 2024-11-30 10:42:38 -07:00
parent ebf0179d61
commit 73583fdea1
2 changed files with 14 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

16
models/git/commit_status.go
View file

@ -289,6 +289,12 @@ func GetLatestCommitStatus(ctx context.Context, repoID int64, sha string, listOp
// GetLatestCommitStatusForPairs returns all statuses with a unique context for a given list of repo-sha pairs
func GetLatestCommitStatusForPairs(ctx context.Context, repoSHAs []RepoSHA) (map[int64][]*CommitStatus, error) {
results := []*CommitStatus{}
repoStatuses := make(map[int64][]*CommitStatus)
if len(repoSHAs) == 0 {
// Avoid performing query when there will be no query conditions added.
return repoStatuses, nil
}
// Create a disjunction of conditions for each repoID and SHA pair
conds := make([]builder.Cond, 0, len(repoSHAs))
@ -305,8 +311,6 @@ func GetLatestCommitStatusForPairs(ctx context.Context, repoSHAs []RepoSHA) (map
return nil, err
}
repoStatuses := make(map[int64][]*CommitStatus)
// Group the statuses by repo ID
for _, status := range results {
repoStatuses[status.RepoID] = append(repoStatuses[status.RepoID], status)
@ -321,6 +325,12 @@ func GetLatestCommitStatusForRepoCommitIDs(ctx context.Context, repoID int64, co
Index int64
SHA string
}
repoStatuses := make(map[string][]*CommitStatus)
if len(commitIDs) == 0 {
// Avoid performing query when there will be no `sha` query conditions added.
return repoStatuses, nil
}
getBase := func() *xorm.Session {
return db.GetEngine(ctx).Table(&CommitStatus{}).Where("repo_id = ?", repoID)
@ -340,8 +350,6 @@ func GetLatestCommitStatusForRepoCommitIDs(ctx context.Context, repoID int64, co
return nil, err
}
repoStatuses := make(map[string][]*CommitStatus)
if len(results) > 0 {
statuses := make([]*CommitStatus, 0, len(results))