mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-12-29 12:04:17 +00:00
14750f3d11
Fix #28056
Backport #28361
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.
(cherry picked from commit 87db4a47c8
)
150 lines
4.1 KiB
Go
150 lines
4.1 KiB
Go
// 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"
|
|
"code.gitea.io/gitea/modules/util"
|
|
|
|
"xorm.io/builder"
|
|
"xorm.io/xorm"
|
|
)
|
|
|
|
type BranchList []*Branch
|
|
|
|
func (branches BranchList) LoadDeletedBy(ctx context.Context) error {
|
|
ids := container.Set[int64]{}
|
|
for _, branch := range branches {
|
|
if !branch.IsDeleted {
|
|
continue
|
|
}
|
|
ids.Add(branch.DeletedByID)
|
|
}
|
|
usersMap := make(map[int64]*user_model.User, len(ids))
|
|
if err := db.GetEngine(ctx).In("id", ids.Values()).Find(&usersMap); err != nil {
|
|
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 {
|
|
ids := container.Set[int64]{}
|
|
for _, branch := range branches {
|
|
if branch.PusherID > 0 { // pusher_id maybe zero because some branches are sync by backend with no pusher
|
|
ids.Add(branch.PusherID)
|
|
}
|
|
}
|
|
usersMap := make(map[int64]*user_model.User, len(ids))
|
|
if err := db.GetEngine(ctx).In("id", ids.Values()).Find(&usersMap); err != nil {
|
|
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
|
|
IsDeletedBranch util.OptionalBool
|
|
OrderBy string
|
|
Keyword string
|
|
}
|
|
|
|
func (opts FindBranchOptions) ToConds() builder.Cond {
|
|
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))
|
|
}
|
|
if !opts.IsDeletedBranch.IsNone() {
|
|
cond = cond.And(builder.Eq{"is_deleted": opts.IsDeletedBranch.IsTrue()})
|
|
}
|
|
if opts.Keyword != "" {
|
|
cond = cond.And(builder.Like{"name", opts.Keyword})
|
|
}
|
|
return cond
|
|
}
|
|
|
|
func CountBranches(ctx context.Context, opts FindBranchOptions) (int64, error) {
|
|
return db.GetEngine(ctx).Where(opts.ToConds()).Count(&Branch{})
|
|
}
|
|
|
|
func orderByBranches(sess *xorm.Session, opts FindBranchOptions) *xorm.Session {
|
|
if !opts.IsDeletedBranch.IsFalse() { // if deleted branch included, put them at the end
|
|
sess = sess.OrderBy("is_deleted ASC")
|
|
}
|
|
|
|
if opts.OrderBy == "" {
|
|
// the commit_time might be the same, so add the "name" to make sure the order is stable
|
|
opts.OrderBy = "commit_time DESC, name ASC"
|
|
}
|
|
return sess.OrderBy(opts.OrderBy)
|
|
}
|
|
|
|
func FindBranches(ctx context.Context, opts FindBranchOptions) (BranchList, error) {
|
|
sess := db.GetEngine(ctx).Where(opts.ToConds())
|
|
if opts.PageSize > 0 && !opts.IsListAll() {
|
|
sess = db.SetSessionPagination(sess, &opts.ListOptions)
|
|
}
|
|
sess = orderByBranches(sess, opts)
|
|
|
|
var branches []*Branch
|
|
return branches, sess.Find(&branches)
|
|
}
|
|
|
|
func FindBranchNames(ctx context.Context, opts FindBranchOptions) ([]string, error) {
|
|
sess := db.GetEngine(ctx).Select("name").Where(opts.ToConds())
|
|
if opts.PageSize > 0 && !opts.IsListAll() {
|
|
sess = db.SetSessionPagination(sess, &opts.ListOptions)
|
|
}
|
|
sess = orderByBranches(sess, opts)
|
|
var branches []string
|
|
if err := sess.Table("branch").Find(&branches); err != nil {
|
|
return nil, err
|
|
}
|
|
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
|
|
}
|