diff options
| author | Stan Hu <stanhu@gmail.com> | 2016-07-27 15:35:53 -0700 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2016-07-27 15:41:25 -0700 |
| commit | 8a9fc2b67e5bb6aeabdffa1f91115ac7613a505a (patch) | |
| tree | bb846b5448ceee8c4018ed05a12d027737404783 | |
| parent | 95efb6f1163b7c2c40d03ddd834016905fc45b50 (diff) | |
| download | gitlab-ce-8a9fc2b67e5bb6aeabdffa1f91115ac7613a505a.tar.gz | |
Cache the commit author in RequestStore to avoid extra lookups in PostReceive
In a PostReceive task with 697 commits (8.9 RC1 -> RC8), looking up
the commit author takes about 10% of the time. Caching this information
in RequestStore saves a few seconds from the overall processing time.
Improves #18663
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/models/commit.rb | 9 |
2 files changed, 9 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG index 5ff0cb42ccc..d2ed7d8708e 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -3,6 +3,7 @@ Please view this file on the master branch, on stable branches it's out of date. v 8.11.0 (unreleased) - Remove magic comments (`# encoding: UTF-8`) from Ruby files. !5456 (winniehell) - Fix CI status icon link underline (ClemMakesApps) + - Cache the commit author in RequestStore to avoid extra lookups in PostReceive - Fix of 'Commits being passed to custom hooks are already reachable when using the UI' - Add support for using RequestStore within Sidekiq tasks via SIDEKIQ_REQUEST_STORE env variable - Limit git rev-list output count to one in forced push check diff --git a/app/models/commit.rb b/app/models/commit.rb index f80f1063406..6a0d32d406e 100644 --- a/app/models/commit.rb +++ b/app/models/commit.rb @@ -178,7 +178,14 @@ class Commit end def author - @author ||= User.find_by_any_email(author_email.downcase) + key = "commit_author:#{author_email}" + + # nil is a valid value since no author may exist in the system + unless RequestStore.store.has_key?(key) + RequestStore.store[key] = User.find_by_any_email(author_email.downcase) + end + + @author ||= RequestStore.store[key] end def committer |