diff options
| author | Lunny Xiao <xiaolunwen@gmail.com> | 2024-03-21 21:13:08 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-21 14:13:08 +0100 |
| commit | 62f8174aa2fae1481c7e17a6afcb731a5b178cd0 (patch) | |
| tree | f94686ea110e943418a25534e0306f45169c9f48 /tests/integration | |
| parent | 01500957c29f6bfa2396b8457dbb0645edaafa99 (diff) | |
| download | gitea-62f8174aa2fae1481c7e17a6afcb731a5b178cd0.tar.gz gitea-62f8174aa2fae1481c7e17a6afcb731a5b178cd0.zip | |
Performance improvements for pull request list page (#29900)
This PR will avoid load pullrequest.Issue twice in pull request list
page. It will reduce x times database queries for those WIP pull
requests.
Partially fix #29585
---------
Co-authored-by: Giteabot <teabot@gitea.io>
Diffstat (limited to 'tests/integration')
| -rw-r--r-- | tests/integration/pull_merge_test.go | 4 | ||||
| -rw-r--r-- | tests/integration/pull_update_test.go | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/tests/integration/pull_merge_test.go b/tests/integration/pull_merge_test.go index a04b4c98cd..daf411f452 100644 --- a/tests/integration/pull_merge_test.go +++ b/tests/integration/pull_merge_test.go @@ -516,8 +516,8 @@ func TestConflictChecking(t *testing.T) { assert.NoError(t, err) issue := unittest.AssertExistsAndLoadBean(t, &issues_model.Issue{Title: "PR with conflict!"}) - conflictingPR, err := issues_model.GetPullRequestByIssueID(db.DefaultContext, issue.ID) - assert.NoError(t, err) + assert.NoError(t, issue.LoadPullRequest(db.DefaultContext)) + conflictingPR := issue.PullRequest // Ensure conflictedFiles is populated. assert.Len(t, conflictingPR.ConflictedFiles, 1) diff --git a/tests/integration/pull_update_test.go b/tests/integration/pull_update_test.go index 078253ffb0..5ae241f3af 100644 --- a/tests/integration/pull_update_test.go +++ b/tests/integration/pull_update_test.go @@ -177,8 +177,7 @@ func createOutdatedPR(t *testing.T, actor, forkOrg *user_model.User) *issues_mod assert.NoError(t, err) issue := unittest.AssertExistsAndLoadBean(t, &issues_model.Issue{Title: "Test Pull -to-update-"}) - pr, err := issues_model.GetPullRequestByIssueID(db.DefaultContext, issue.ID) - assert.NoError(t, err) + assert.NoError(t, issue.LoadPullRequest(db.DefaultContext)) - return pr + return issue.PullRequest } |