mirror of
https://github.com/go-gitea/gitea.git
synced 2025-11-08 18:22:07 +01:00
Optimize refreshAccesses with cross-comparison to minimize DB operations
Implemented the FIXME to perform cross-comparison between existing and desired accesses, reducing deletions, updates, and insertions to the minimum necessary. This improves performance for repositories with many users by avoiding bulk delete-all and re-insert-all.
This commit is contained in:
parent
2d36a0c9ff
commit
a2b0da306c
@ -84,7 +84,6 @@ func updateUserAccess(accessMap map[int64]*userAccess, user *user_model.User, mo
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// FIXME: do cross-comparison so reduce deletions and additions to the minimum?
|
|
||||||
func refreshAccesses(ctx context.Context, repo *repo_model.Repository, accessMap map[int64]*userAccess) (err error) {
|
func refreshAccesses(ctx context.Context, repo *repo_model.Repository, accessMap map[int64]*userAccess) (err error) {
|
||||||
minMode := perm.AccessModeRead
|
minMode := perm.AccessModeRead
|
||||||
if err := repo.LoadOwner(ctx); err != nil {
|
if err := repo.LoadOwner(ctx); err != nil {
|
||||||
@ -97,30 +96,76 @@ func refreshAccesses(ctx context.Context, repo *repo_model.Repository, accessMap
|
|||||||
minMode = perm.AccessModeWrite
|
minMode = perm.AccessModeWrite
|
||||||
}
|
}
|
||||||
|
|
||||||
newAccesses := make([]Access, 0, len(accessMap))
|
// Query existing accesses for cross-comparison
|
||||||
|
existingAccesses, err := db.Find[Access](ctx, &Access{RepoID: repo.ID})
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("find existing accesses: %w", err)
|
||||||
|
}
|
||||||
|
existingMap := make(map[int64]perm.AccessMode, len(existingAccesses))
|
||||||
|
for _, a := range existingAccesses {
|
||||||
|
existingMap[a.UserID] = a.Mode
|
||||||
|
}
|
||||||
|
|
||||||
|
var toDelete []int64
|
||||||
|
var toInsert []Access
|
||||||
|
var toUpdate []struct {
|
||||||
|
UserID int64
|
||||||
|
Mode perm.AccessMode
|
||||||
|
}
|
||||||
|
|
||||||
|
// Determine changes
|
||||||
for userID, ua := range accessMap {
|
for userID, ua := range accessMap {
|
||||||
if ua.Mode < minMode && !ua.User.IsRestricted {
|
if ua.Mode < minMode && !ua.User.IsRestricted {
|
||||||
continue
|
// Should not have access
|
||||||
|
if _, exists := existingMap[userID]; exists {
|
||||||
|
toDelete = append(toDelete, userID)
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
desiredMode := ua.Mode
|
||||||
|
if existingMode, exists := existingMap[userID]; exists {
|
||||||
|
if existingMode != desiredMode {
|
||||||
|
toUpdate = append(toUpdate, struct {
|
||||||
|
UserID int64
|
||||||
|
Mode perm.AccessMode
|
||||||
|
}{UserID: userID, Mode: desiredMode})
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
toInsert = append(toInsert, Access{
|
||||||
|
UserID: userID,
|
||||||
|
RepoID: repo.ID,
|
||||||
|
Mode: desiredMode,
|
||||||
|
})
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
delete(existingMap, userID)
|
||||||
newAccesses = append(newAccesses, Access{
|
|
||||||
UserID: userID,
|
|
||||||
RepoID: repo.ID,
|
|
||||||
Mode: ua.Mode,
|
|
||||||
})
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Delete old accesses and insert new ones for repository.
|
// Remaining in existingMap should be deleted
|
||||||
if _, err = db.DeleteByBean(ctx, &Access{RepoID: repo.ID}); err != nil {
|
for userID := range existingMap {
|
||||||
return fmt.Errorf("delete old accesses: %w", err)
|
toDelete = append(toDelete, userID)
|
||||||
}
|
|
||||||
if len(newAccesses) == 0 {
|
|
||||||
return nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if err = db.Insert(ctx, newAccesses); err != nil {
|
// Execute deletions
|
||||||
return fmt.Errorf("insert new accesses: %w", err)
|
if len(toDelete) > 0 {
|
||||||
|
if _, err = db.GetEngine(ctx).In("user_id", toDelete).And("repo_id = ?", repo.ID).Delete(&Access{}); err != nil {
|
||||||
|
return fmt.Errorf("delete accesses: %w", err)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Execute updates
|
||||||
|
for _, u := range toUpdate {
|
||||||
|
if _, err = db.GetEngine(ctx).Where("user_id = ? AND repo_id = ?", u.UserID, repo.ID).Cols("mode").Update(&Access{Mode: u.Mode}); err != nil {
|
||||||
|
return fmt.Errorf("update access for user %d: %w", u.UserID, err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Execute insertions
|
||||||
|
if len(toInsert) > 0 {
|
||||||
|
if err = db.Insert(ctx, toInsert); err != nil {
|
||||||
|
return fmt.Errorf("insert new accesses: %w", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user