diff options
author | Felipe Artur <felipefac@gmail.com> | 2018-06-15 14:32:37 -0300 |
---|---|---|
committer | Felipe Artur <felipefac@gmail.com> | 2018-06-21 17:34:33 -0300 |
commit | 4ab1011d427687b44ed937684c1a5a364d156a70 (patch) | |
tree | 9c40fa7880f6c4c2ece330519e490b71477d4e8f /app/services | |
parent | e13aeab5a64bdaed74f2fff65d1bb905de4783ee (diff) | |
download | gitlab-ce-4ab1011d427687b44ed937684c1a5a364d156a70.tar.gz |
Fix refresh cache for open issues count service
Diffstat (limited to 'app/services')
-rw-r--r-- | app/services/base_count_service.rb | 6 | ||||
-rw-r--r-- | app/services/projects/batch_open_issues_count_service.rb | 7 | ||||
-rw-r--r-- | app/services/projects/count_service.rb | 6 | ||||
-rw-r--r-- | app/services/projects/open_issues_count_service.rb | 30 |
4 files changed, 42 insertions, 7 deletions
diff --git a/app/services/base_count_service.rb b/app/services/base_count_service.rb index f2844854112..975e288301c 100644 --- a/app/services/base_count_service.rb +++ b/app/services/base_count_service.rb @@ -17,7 +17,7 @@ class BaseCountService end def refresh_cache(&block) - Rails.cache.write(cache_key, block_given? ? yield : uncached_count, raw: raw?) + update_cache_for_key(cache_key, &block) end def uncached_count @@ -41,4 +41,8 @@ class BaseCountService def cache_options { raw: raw? } end + + def update_cache_for_key(key, &block) + Rails.cache.write(key, block_given? ? yield : uncached_count, raw: raw?) + end end diff --git a/app/services/projects/batch_open_issues_count_service.rb b/app/services/projects/batch_open_issues_count_service.rb index 3b0ade2419b..1e00da04197 100644 --- a/app/services/projects/batch_open_issues_count_service.rb +++ b/app/services/projects/batch_open_issues_count_service.rb @@ -3,10 +3,11 @@ # because the service use maps to retrieve the project ids module Projects class BatchOpenIssuesCountService < Projects::BatchCountService + + # Method not needed. Cache here is updated using + # overloaded OpenIssuesCount#refresh_cache method def global_count - @global_count ||= begin - count_service.query(project_ids).group(:project_id).count - end + nil end def count_service diff --git a/app/services/projects/count_service.rb b/app/services/projects/count_service.rb index 933829b557b..4c8e000928f 100644 --- a/app/services/projects/count_service.rb +++ b/app/services/projects/count_service.rb @@ -22,8 +22,10 @@ module Projects ) end - def cache_key - ['projects', 'count_service', VERSION, @project.id, cache_key_name] + def cache_key(key = nil) + cache_key = key || cache_key_name + + ['projects', 'count_service', VERSION, @project.id, cache_key] end def self.query(project_ids) diff --git a/app/services/projects/open_issues_count_service.rb b/app/services/projects/open_issues_count_service.rb index 0a004677417..e70ee86f644 100644 --- a/app/services/projects/open_issues_count_service.rb +++ b/app/services/projects/open_issues_count_service.rb @@ -4,6 +4,10 @@ module Projects class OpenIssuesCountService < Projects::CountService include Gitlab::Utils::StrongMemoize + # Cache keys used to store issues count + PUBLIC_COUNT_KEY = 'public_open_issues_count'.freeze + TOTAL_COUNT_KEY = 'total_open_issues_count'.freeze + def initialize(project, user = nil) @user = user @@ -11,7 +15,7 @@ module Projects end def cache_key_name - public_only? ? 'public_open_issues_count' : 'total_open_issues_count' + public_only? ? PUBLIC_COUNT_KEY : TOTAL_COUNT_KEY end def public_only? @@ -28,6 +32,30 @@ module Projects end end + def public_count_cache_key + cache_key(PUBLIC_COUNT_KEY) + end + + def total_count_cache_key + cache_key(TOTAL_COUNT_KEY) + end + + # The block passed as parameter is ignored because we need to refresh both + # cache keys on every case. + def refresh_cache(&block) + count_grouped_by_confidential = self.class.query(@project, public_only: false).group(:confidential).count + public_count = count_grouped_by_confidential[false] || 0 + total_count = public_count + (count_grouped_by_confidential[true] || 0) + + update_cache_for_key(public_count_cache_key) do + public_count + end + + update_cache_for_key(total_count_cache_key) do + total_count + end + end + # We only show total issues count for reporters # which are allowed to view confidential issues # This will still show a discrepancy on issues number but should be less than before. |