From e7849b0b25390a96881d1f8affd1eadab4e9de62 Mon Sep 17 00:00:00 2001 From: Yorick Peterse Date: Thu, 24 Mar 2016 16:41:48 +0100 Subject: [PATCH] Memoize reference_pattern/link_reference_pattern These methods are called quite often in loops so by memoizing their output we can reduce timings a bit. --- app/models/commit.rb | 4 ++-- app/models/commit_range.rb | 4 ++-- app/models/external_issue.rb | 2 +- app/models/issue.rb | 4 ++-- app/models/label.rb | 2 +- app/models/merge_request.rb | 4 ++-- app/models/milestone.rb | 2 +- app/models/snippet.rb | 4 ++-- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/app/models/commit.rb b/app/models/commit.rb index d0dbe009d0d..d09876a07d9 100644 --- a/app/models/commit.rb +++ b/app/models/commit.rb @@ -74,14 +74,14 @@ class Commit # # This pattern supports cross-project references. def self.reference_pattern - %r{ + @reference_pattern ||= %r{ (?:#{Project.reference_pattern}#{reference_prefix})? (?\h{7,40}) }x end def self.link_reference_pattern - super("commit", /(?\h{7,40})/) + @link_reference_pattern ||= super("commit", /(?\h{7,40})/) end def to_reference(from_project = nil) diff --git a/app/models/commit_range.rb b/app/models/commit_range.rb index 289dbc57287..51673897d98 100644 --- a/app/models/commit_range.rb +++ b/app/models/commit_range.rb @@ -43,14 +43,14 @@ class CommitRange # # This pattern supports cross-project references. def self.reference_pattern - %r{ + @reference_pattern ||= %r{ (?:#{Project.reference_pattern}#{reference_prefix})? (?#{STRICT_PATTERN}) }x end def self.link_reference_pattern - super("compare", /(?#{PATTERN})/) + @link_reference_pattern ||= super("compare", /(?#{PATTERN})/) end # Initialize a CommitRange diff --git a/app/models/external_issue.rb b/app/models/external_issue.rb index 2ca79df0a29..b8585d4e577 100644 --- a/app/models/external_issue.rb +++ b/app/models/external_issue.rb @@ -31,7 +31,7 @@ class ExternalIssue # Pattern used to extract `JIRA-123` issue references from text def self.reference_pattern - %r{(?\b([A-Z][A-Z0-9_]+-)\d+)} + @reference_pattern ||= %r{(?\b([A-Z][A-Z0-9_]+-)\d+)} end def to_reference(_from_project = nil) diff --git a/app/models/issue.rb b/app/models/issue.rb index ed960cb39f4..e064b0f8b95 100644 --- a/app/models/issue.rb +++ b/app/models/issue.rb @@ -73,14 +73,14 @@ class Issue < ActiveRecord::Base # # This pattern supports cross-project references. def self.reference_pattern - %r{ + @reference_pattern ||= %r{ (#{Project.reference_pattern})? #{Regexp.escape(reference_prefix)}(?\d+) }x end def self.link_reference_pattern - super("issues", /(?\d+)/) + @link_reference_pattern ||= super("issues", /(?\d+)/) end def to_reference(from_project = nil) diff --git a/app/models/label.rb b/app/models/label.rb index 500d5a35521..55c01cae762 100644 --- a/app/models/label.rb +++ b/app/models/label.rb @@ -56,7 +56,7 @@ class Label < ActiveRecord::Base # This pattern supports cross-project references. # def self.reference_pattern - %r{ + @reference_pattern ||= %r{ (#{Project.reference_pattern})? #{Regexp.escape(reference_prefix)} (?: diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index 1245cc16d6a..45c3b0a3a66 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -149,14 +149,14 @@ class MergeRequest < ActiveRecord::Base # # This pattern supports cross-project references. def self.reference_pattern - %r{ + @reference_pattern ||= %r{ (#{Project.reference_pattern})? #{Regexp.escape(reference_prefix)}(?\d+) }x end def self.link_reference_pattern - super("merge_requests", /(?\d+)/) + @link_reference_pattern ||= super("merge_requests", /(?\d+)/) end # Returns all the merge requests from an ActiveRecord:Relation. diff --git a/app/models/milestone.rb b/app/models/milestone.rb index bbd59eab9ae..07196c0fca4 100644 --- a/app/models/milestone.rb +++ b/app/models/milestone.rb @@ -79,7 +79,7 @@ class Milestone < ActiveRecord::Base end def self.link_reference_pattern - super("milestones", /(?\d+)/) + @link_reference_pattern ||= super("milestones", /(?\d+)/) end def self.upcoming diff --git a/app/models/snippet.rb b/app/models/snippet.rb index b9e835a4486..b96e3937281 100644 --- a/app/models/snippet.rb +++ b/app/models/snippet.rb @@ -56,14 +56,14 @@ class Snippet < ActiveRecord::Base # # This pattern supports cross-project references. def self.reference_pattern - %r{ + @reference_pattern ||= %r{ (#{Project.reference_pattern})? #{Regexp.escape(reference_prefix)}(?\d+) }x end def self.link_reference_pattern - super("snippets", /(?\d+)/) + @link_reference_pattern ||= super("snippets", /(?\d+)/) end def to_reference(from_project = nil)