diff options
| author | Yorick Peterse <yorickpeterse@gmail.com> | 2016-01-27 14:09:58 +0100 |
|---|---|---|
| committer | Yorick Peterse <yorickpeterse@gmail.com> | 2016-02-01 11:04:05 +0100 |
| commit | 99492d6b8d01f8ec0e5c391532e364d06dbd41b4 (patch) | |
| tree | 4e243069a1836347bc7406ea3a0f1508bbf623fe /app/models/merge_request.rb | |
| parent | ca171b8190623023f3e6d00146abee8651cec857 (diff) | |
| download | gitlab-ce-99492d6b8d01f8ec0e5c391532e364d06dbd41b4.tar.gz | |
Optimize fetching issues closed by a merge requestmerge-request-closes-issues-performance
Instead of running ClosingIssueExtractor for every commit in a merge
request we can gather all the commit messages (and the merge request
description), concatenate all this together and then run
ClosingIssueExtractor only once.
The result of this is that MergeRequest#closes_issues is now between
3.5x and 4x faster than the old setup. Using a merge request with 10
commits (each referencing a number of issues to close) this reduced the
call duration from around 200 milliseconds to around 50 milliseconds.
As a result of these changes the Jira related tests for
MergeRequest#closes_issues have been removed. These tests stubbed
Commit#closes_issues meaning that the only code that was really tested
was the call to Array#uniq to filter out duplicate issues. As this code
is no longer used (nor present) the corresponding tests were removed.
Related: gitlab-org/gitlab-ce#12419
Diffstat (limited to 'app/models/merge_request.rb')
| -rw-r--r-- | app/models/merge_request.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index 41dd248d80a..09af60a2016 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -346,10 +346,10 @@ class MergeRequest < ActiveRecord::Base # Return the set of issues that will be closed if this merge request is accepted. def closes_issues(current_user = self.author) if target_branch == project.default_branch - issues = commits.flat_map { |c| c.closes_issues(current_user) } - issues.push(*Gitlab::ClosingIssueExtractor.new(project, current_user). - closed_by_message(description)) - issues.uniq(&:id) + messages = commits.map(&:safe_message) << description + + Gitlab::ClosingIssueExtractor.new(project, current_user). + closed_by_message(messages.join("\n")) else [] end |