finn/forgejo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Get latest commit statuses from database instead of git data on dashboard for repositories (#25605)

Browse source 
related #24638
This commit is contained in:
Lunny Xiao 2023-07-03 09:53:05 +08:00 committed by GitHub
parent 640a88fa09
commit 807c9712ef
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
models/git/branch_list.go
View file

@ -130,3 +130,20 @@ func FindBranchNames(ctx context.Context, opts FindBranchOptions) ([]string, err
} }
return branches, nil return branches, nil
} }
func FindBranchesByRepoAndBranchName(ctx context.Context, repoBranches map[int64]string) (map[int64]string, error) {
cond := builder.NewCond()
for repoID, branchName := range repoBranches {
cond = cond.Or(builder.And(builder.Eq{"repo_id": repoID}, builder.Eq{"name": branchName}))
}
var branches []*Branch
if err := db.GetEngine(ctx).
Where(cond).Find(&branches); err != nil {
return nil, err
}
branchMap := make(map[int64]string, len(branches))
for _, branch := range branches {
branchMap[branch.RepoID] = branch.CommitID
}
return branchMap, nil
}

14
routers/web/repo/repo.go
View file

@ -579,13 +579,15 @@ func SearchRepo(ctx *context.Context) {
// collect the latest commit of each repo // collect the latest commit of each repo
// at most there are dozens of repos (limited by MaxResponseItems), so it's not a big problem at the moment // at most there are dozens of repos (limited by MaxResponseItems), so it's not a big problem at the moment
repoIDsToLatestCommitSHAs := make(map[int64]string, len(repos)) repoBranchNames := make(map[int64]string, len(repos))
for _, repo := range repos { for _, repo := range repos {
commitID, err := repo_service.GetBranchCommitID(ctx, repo, repo.DefaultBranch) repoBranchNames[repo.ID] = repo.DefaultBranch
if err != nil { }
continue
} repoIDsToLatestCommitSHAs, err := git_model.FindBranchesByRepoAndBranchName(ctx, repoBranchNames)
repoIDsToLatestCommitSHAs[repo.ID] = commitID if err != nil {
log.Error("FindBranchesByRepoAndBranchName: %v", err)
return
} }
// call the database O(1) times to get the commit statuses for all repos // call the database O(1) times to get the commit statuses for all repos