aboutsummaryrefslogtreecommitdiffstats
path: root/models/git/commit_status.go
diff options
context:
space:
mode:
authorZettat123 <zettat123@gmail.com>2024-04-30 11:53:16 +0800
committerGitHub <noreply@github.com>2024-04-30 11:53:16 +0800
commit7ad50313284db7eec565ad1750108de1444c5a84 (patch)
tree34770cfe6873c39ad68b2375fbb411b0f35dacf0 /models/git/commit_status.go
parent61b495e5ab604a26c867433e5c5ae5b07267e30f (diff)
downloadgitea-7ad50313284db7eec565ad1750108de1444c5a84.tar.gz
gitea-7ad50313284db7eec565ad1750108de1444c5a84.zip
Fix duplicate status check contexts (#30660)
Caused by #30076. There may be some duplicate status check contexts when setting status checks for a branch protection rule. The duplicate contexts should be removed. Before: <img src="https://github.com/go-gitea/gitea/assets/15528715/97f4de2d-4868-47a3-8a99-5a180f9ac0a3" width="600px" /> After: <img src="https://github.com/go-gitea/gitea/assets/15528715/ff7289c5-9793-4090-ba31-e8cb3c85f8a3" width="600px" />
Diffstat (limited to 'models/git/commit_status.go')
-rw-r--r--models/git/commit_status.go30
1 files changed, 5 insertions, 25 deletions
diff --git a/models/git/commit_status.go b/models/git/commit_status.go
index c3cda7b73d..d12afc42c5 100644
--- a/models/git/commit_status.go
+++ b/models/git/commit_status.go
@@ -397,36 +397,16 @@ func GetLatestCommitStatusForRepoCommitIDs(ctx context.Context, repoID int64, co
// FindRepoRecentCommitStatusContexts returns repository's recent commit status contexts
func FindRepoRecentCommitStatusContexts(ctx context.Context, repoID int64, before time.Duration) ([]string, error) {
- type result struct {
- Index int64
- SHA string
- }
- getBase := func() *xorm.Session {
- return db.GetEngine(ctx).Table(&CommitStatus{}).Where("repo_id = ?", repoID)
- }
-
start := timeutil.TimeStampNow().AddDuration(-before)
- results := make([]result, 0, 10)
- sess := getBase().And("updated_unix >= ?", start).
- Select("max( `index` ) as `index`, sha").
- GroupBy("context_hash, sha").OrderBy("max( `index` ) desc")
-
- err := sess.Find(&results)
- if err != nil {
+ var contexts []string
+ if err := db.GetEngine(ctx).Table("commit_status").
+ Where("repo_id = ?", repoID).And("updated_unix >= ?", start).
+ Cols("context").Distinct().Find(&contexts); err != nil {
return nil, err
}
- contexts := make([]string, 0, len(results))
- if len(results) == 0 {
- return contexts, nil
- }
-
- conds := make([]builder.Cond, 0, len(results))
- for _, result := range results {
- conds = append(conds, builder.Eq{"`index`": result.Index, "sha": result.SHA})
- }
- return contexts, getBase().And(builder.Or(conds...)).Select("context").Find(&contexts)
+ return contexts, nil
}
// NewCommitStatusOptions holds options for creating a CommitStatus