-
-
Notifications
You must be signed in to change notification settings - Fork 6.2k
Optimize 'refreshAccesses' to perform update without removing then adding #35702
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
+95
−15
Open
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
a2b0da3
Optimize refreshAccesses with cross-comparison to minimize DB operations
rossigee 250b266
Fix db.Find syntax in refreshAccesses optimization
rossigee 292198c
Add test for refreshAccesses update path and fix db.Find syntax
rossigee 06fd3ec
Merge branch 'main' into optimize-access-refresh-clean
rossigee 7530aa8
Merge branch 'main' into optimize-access-refresh-clean
rossigee c88e9fb
Merge branch 'main' into optimize-access-refresh-clean
rossigee 7a824dd
Merge branch 'go-gitea:main' into optimize-access-refresh-clean
rossigee File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -91,7 +91,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) { | ||
lunny marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| minMode := perm.AccessModeRead | ||
| if err := repo.LoadOwner(ctx); err != nil { | ||
|
|
@@ -104,30 +103,76 @@ func refreshAccesses(ctx context.Context, repo *repo_model.Repository, accessMap | |
| minMode = perm.AccessModeWrite | ||
| } | ||
|
|
||
| newAccesses := make([]Access, 0, len(accessMap)) | ||
| // Query existing accesses for cross-comparison | ||
| var existingAccesses []Access | ||
| if err := db.GetEngine(ctx).Where(builder.Eq{"repo_id": repo.ID}).Find(&existingAccesses); 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 | ||
| } | ||
|
Comment on lines
+118
to
+121
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. It can reuse the Access struct, and it could be clearer for the code below |
||
|
|
||
| // Determine changes | ||
| for userID, ua := range accessMap { | ||
| if ua.Mode < minMode && !ua.User.IsRestricted { | ||
| continue | ||
| // Should not have access | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The comment seems not right. If I read correctly, it doesn't mean "Should not have access", but "default access" is enough? If it really means "should not have access", why There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I made a test:
|
||
| 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) | ||
wxiaoguang marked this conversation as resolved.
Show resolved
Hide resolved
wxiaoguang marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| } | ||
|
|
||
| newAccesses = append(newAccesses, Access{ | ||
| UserID: userID, | ||
| RepoID: repo.ID, | ||
| Mode: ua.Mode, | ||
| }) | ||
| // Remaining in existingMap should be deleted | ||
| for userID := range existingMap { | ||
| toDelete = append(toDelete, userID) | ||
wxiaoguang marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| } | ||
|
|
||
| // Delete old accesses and insert new ones for repository. | ||
| if _, err = db.DeleteByBean(ctx, &Access{RepoID: repo.ID}); err != nil { | ||
| return fmt.Errorf("delete old accesses: %w", err) | ||
| // Execute deletions | ||
| 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) | ||
| } | ||
| } | ||
| if len(newAccesses) == 0 { | ||
| return nil | ||
|
|
||
| // 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) | ||
| } | ||
| } | ||
|
|
||
| if err = db.Insert(ctx, newAccesses); err != nil { | ||
| return fmt.Errorf("insert new accesses: %w", 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 | ||
| } | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -132,3 +132,38 @@ func TestRepository_RecalculateAccesses2(t *testing.T) { | |
| assert.NoError(t, err) | ||
| assert.False(t, has) | ||
| } | ||
|
|
||
| func TestRepository_RecalculateAccesses_UpdateMode(t *testing.T) { | ||
| // Test the update path in refreshAccesses optimization | ||
| // Scenario: User's access mode changes from Read to Write | ||
| assert.NoError(t, unittest.PrepareTestDatabase()) | ||
| repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 4}) | ||
| assert.NoError(t, repo.LoadOwner(t.Context())) | ||
|
|
||
| // Verify initial access mode | ||
| initialAccess := &access_model.Access{UserID: 4, RepoID: 4} | ||
| has, err := db.GetEngine(t.Context()).Get(initialAccess) | ||
| assert.NoError(t, err) | ||
| assert.True(t, has) | ||
| initialMode := initialAccess.Mode | ||
|
|
||
| // Change collaboration mode to trigger update path | ||
| newMode := perm_model.AccessModeAdmin | ||
| assert.NotEqual(t, initialMode, newMode, "New mode should differ from initial mode") | ||
|
|
||
| _, err = db.GetEngine(t.Context()). | ||
| Where("user_id = ? AND repo_id = ?", 4, 4). | ||
| Cols("mode"). | ||
| Update(&repo_model.Collaboration{Mode: newMode}) | ||
| assert.NoError(t, err) | ||
|
|
||
| // Recalculate accesses - should UPDATE existing access, not delete+insert | ||
| assert.NoError(t, access_model.RecalculateAccesses(t.Context(), repo)) | ||
|
|
||
| // Verify access was updated, not deleted and re-inserted | ||
| updatedAccess := &access_model.Access{UserID: 4, RepoID: 4} | ||
| has, err = db.GetEngine(t.Context()).Get(updatedAccess) | ||
| assert.NoError(t, err) | ||
| assert.True(t, has, "Access should still exist") | ||
| assert.Equal(t, newMode, updatedAccess.Mode, "Access mode should be updated to new collaboration mode") | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. It's better to have another use case to remove this user's permission and have a test again. |
||
| } | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.