2023-06-29 15:33:20 +05:30
|
|
|
// Copyright 2023 The Gitea Authors. All rights reserved.
|
|
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
|
|
|
|
package git
|
|
|
|
|
|
|
|
import (
|
|
|
|
"context"
|
|
|
|
|
|
|
|
"code.gitea.io/gitea/models/db"
|
|
|
|
user_model "code.gitea.io/gitea/models/user"
|
|
|
|
"code.gitea.io/gitea/modules/container"
|
2024-02-23 07:48:33 +05:30
|
|
|
"code.gitea.io/gitea/modules/optional"
|
2023-06-29 15:33:20 +05:30
|
|
|
|
|
|
|
"xorm.io/builder"
|
|
|
|
)
|
|
|
|
|
|
|
|
type BranchList []*Branch
|
|
|
|
|
|
|
|
func (branches BranchList) LoadDeletedBy(ctx context.Context) error {
|
2024-04-09 17:57:30 +05:30
|
|
|
ids := container.FilterSlice(branches, func(branch *Branch) (int64, bool) {
|
|
|
|
return branch.DeletedByID, branch.IsDeleted
|
|
|
|
})
|
|
|
|
|
2023-06-29 15:33:20 +05:30
|
|
|
usersMap := make(map[int64]*user_model.User, len(ids))
|
2024-04-09 17:57:30 +05:30
|
|
|
if err := db.GetEngine(ctx).In("id", ids).Find(&usersMap); err != nil {
|
2023-06-29 15:33:20 +05:30
|
|
|
return err
|
|
|
|
}
|
|
|
|
for _, branch := range branches {
|
|
|
|
if !branch.IsDeleted {
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
branch.DeletedBy = usersMap[branch.DeletedByID]
|
|
|
|
if branch.DeletedBy == nil {
|
|
|
|
branch.DeletedBy = user_model.NewGhostUser()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
|
|
|
func (branches BranchList) LoadPusher(ctx context.Context) error {
|
2024-04-09 17:57:30 +05:30
|
|
|
ids := container.FilterSlice(branches, func(branch *Branch) (int64, bool) {
|
|
|
|
// pusher_id maybe zero because some branches are sync by backend with no pusher
|
|
|
|
return branch.PusherID, branch.PusherID > 0
|
|
|
|
})
|
|
|
|
|
2023-06-29 15:33:20 +05:30
|
|
|
usersMap := make(map[int64]*user_model.User, len(ids))
|
2024-04-09 17:57:30 +05:30
|
|
|
if err := db.GetEngine(ctx).In("id", ids).Find(&usersMap); err != nil {
|
2023-06-29 15:33:20 +05:30
|
|
|
return err
|
|
|
|
}
|
|
|
|
for _, branch := range branches {
|
|
|
|
if branch.PusherID <= 0 {
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
branch.Pusher = usersMap[branch.PusherID]
|
|
|
|
if branch.Pusher == nil {
|
|
|
|
branch.Pusher = user_model.NewGhostUser()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
|
|
|
type FindBranchOptions struct {
|
|
|
|
db.ListOptions
|
|
|
|
RepoID int64
|
|
|
|
ExcludeBranchNames []string
|
2024-02-23 07:48:33 +05:30
|
|
|
IsDeletedBranch optional.Option[bool]
|
2023-06-29 15:33:20 +05:30
|
|
|
OrderBy string
|
2023-09-17 13:54:40 +05:30
|
|
|
Keyword string
|
2023-06-29 15:33:20 +05:30
|
|
|
}
|
|
|
|
|
Also sync DB branches on push if necessary (#28361)
Fix #28056
This PR will check whether the repo has zero branch when pushing a
branch. If that, it means this repository hasn't been synced.
The reason caused that is after user upgrade from v1.20 -> v1.21, he
just push branches without visit the repository user interface. Because
all repositories routers will check whether a branches sync is necessary
but push has not such check.
For every repository, it has two states, synced or not synced. If there
is zero branch for a repository, then it will be assumed as non-sync
state. Otherwise, it's synced state. So if we think it's synced, we just
need to update branch/insert new branch. Otherwise do a full sync. So
that, for every push, there will be almost no extra load added. It's
high performance than yours.
For the implementation, we in fact will try to update the branch first,
if updated success with affect records > 0, then all are done. Because
that means the branch has been in the database. If no record is
affected, that means the branch does not exist in database. So there are
two possibilities. One is this is a new branch, then we just need to
insert the record. Another is the branches haven't been synced, then we
need to sync all the branches into database.
2023-12-09 19:00:56 +05:30
|
|
|
func (opts FindBranchOptions) ToConds() builder.Cond {
|
2023-06-29 15:33:20 +05:30
|
|
|
cond := builder.NewCond()
|
|
|
|
if opts.RepoID > 0 {
|
|
|
|
cond = cond.And(builder.Eq{"repo_id": opts.RepoID})
|
|
|
|
}
|
|
|
|
|
|
|
|
if len(opts.ExcludeBranchNames) > 0 {
|
|
|
|
cond = cond.And(builder.NotIn("name", opts.ExcludeBranchNames))
|
|
|
|
}
|
2024-02-23 07:48:33 +05:30
|
|
|
if opts.IsDeletedBranch.Has() {
|
|
|
|
cond = cond.And(builder.Eq{"is_deleted": opts.IsDeletedBranch.Value()})
|
2023-06-29 15:33:20 +05:30
|
|
|
}
|
2023-09-17 13:54:40 +05:30
|
|
|
if opts.Keyword != "" {
|
|
|
|
cond = cond.And(builder.Like{"name", opts.Keyword})
|
|
|
|
}
|
2023-06-29 15:33:20 +05:30
|
|
|
return cond
|
|
|
|
}
|
|
|
|
|
2023-12-11 14:26:48 +05:30
|
|
|
func (opts FindBranchOptions) ToOrders() string {
|
|
|
|
orderBy := opts.OrderBy
|
|
|
|
if orderBy == "" {
|
2023-07-03 09:41:32 +05:30
|
|
|
// the commit_time might be the same, so add the "name" to make sure the order is stable
|
2024-05-31 07:28:41 +05:30
|
|
|
orderBy = "commit_time DESC, name ASC"
|
|
|
|
}
|
|
|
|
if opts.IsDeletedBranch.ValueOrDefault(true) { // if deleted branch included, put them at the beginning
|
|
|
|
orderBy = "is_deleted ASC, " + orderBy
|
2023-06-29 15:33:20 +05:30
|
|
|
}
|
2023-12-11 14:26:48 +05:30
|
|
|
return orderBy
|
2023-06-29 15:33:20 +05:30
|
|
|
}
|
|
|
|
|
|
|
|
func FindBranchNames(ctx context.Context, opts FindBranchOptions) ([]string, error) {
|
Also sync DB branches on push if necessary (#28361)
Fix #28056
This PR will check whether the repo has zero branch when pushing a
branch. If that, it means this repository hasn't been synced.
The reason caused that is after user upgrade from v1.20 -> v1.21, he
just push branches without visit the repository user interface. Because
all repositories routers will check whether a branches sync is necessary
but push has not such check.
For every repository, it has two states, synced or not synced. If there
is zero branch for a repository, then it will be assumed as non-sync
state. Otherwise, it's synced state. So if we think it's synced, we just
need to update branch/insert new branch. Otherwise do a full sync. So
that, for every push, there will be almost no extra load added. It's
high performance than yours.
For the implementation, we in fact will try to update the branch first,
if updated success with affect records > 0, then all are done. Because
that means the branch has been in the database. If no record is
affected, that means the branch does not exist in database. So there are
two possibilities. One is this is a new branch, then we just need to
insert the record. Another is the branches haven't been synced, then we
need to sync all the branches into database.
2023-12-09 19:00:56 +05:30
|
|
|
sess := db.GetEngine(ctx).Select("name").Where(opts.ToConds())
|
2023-06-29 15:33:20 +05:30
|
|
|
if opts.PageSize > 0 && !opts.IsListAll() {
|
|
|
|
sess = db.SetSessionPagination(sess, &opts.ListOptions)
|
|
|
|
}
|
2023-12-11 14:26:48 +05:30
|
|
|
|
2023-06-29 15:33:20 +05:30
|
|
|
var branches []string
|
2023-12-11 14:26:48 +05:30
|
|
|
if err := sess.Table("branch").OrderBy(opts.ToOrders()).Find(&branches); err != nil {
|
2023-06-29 15:33:20 +05:30
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
return branches, nil
|
|
|
|
}
|
2023-07-03 07:23:05 +05:30
|
|
|
|
|
|
|
func FindBranchesByRepoAndBranchName(ctx context.Context, repoBranches map[int64]string) (map[int64]string, error) {
|
Fix git_model.FindBranchesByRepoAndBranchName
When a logged in user with no repositories visits their dashboard, it will
display a search box that lists their own repositories.
This is served by the `repo.SearchRepos` handler, which in turn calls
`commitstatus_service.FindReposLastestCommitStatuses()` with an empty
repo list.
That, in turn, will call `git_model.FindBranchesByRepoAndBranchName()`,
with an empty map. With no map, `FindBranchesByRepoAndBranchName()` ends
up querying the entire `branch` table, because no conditions were set
up.
Armed with a gazillion repo & commit shas, we return to
`FindReposLastestCommitStatuses`, and promptly call
`git_model.GetLatestCommitStatusForPairs`, which constructs a monstrous
query with so many placeholders that the database tells us to go
somewhere else, and flips us off. At least on instances the size of
Codeberg. On smaller instances, it will eventually return, and throw
away all the data, and return an empty set, having performed all this
for naught.
We fix this by short-circuiting `FindBranchesByRepoAndBranchName`, and
returning fast if our inputs are empty.
A test case is included.
Fixes #3521.
Signed-off-by: Gergely Nagy <forgejo@gergo.csillger.hu>
2024-05-01 00:23:47 +05:30
|
|
|
if len(repoBranches) == 0 {
|
|
|
|
return nil, nil
|
|
|
|
}
|
2023-07-03 07:23:05 +05:30
|
|
|
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
|
|
|
|
}
|