Cache Repository#root_ref within a request

When an empty project is loaded in the UI, there are 15 separate Gitaly
FindDefaultBranch calls to determine the root_ref. Previously, it was
not cached even within the request. This change caches it within the
request so only a single FindDefaultBranch RPC is needed.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/58684
This commit is contained in:
Stan Hu 2019-03-07 17:19:56 -08:00
parent 121de6dc6f
commit 0f7ed33759
3 changed files with 53 additions and 43 deletions

View file

@ -534,10 +534,9 @@ class Repository
end
def root_ref
# When the repo does not exist, or there is no root ref, we raise this error so no data is cached.
raw_repository&.root_ref or raise Gitlab::Git::Repository::NoRepository # rubocop:disable Style/AndOr
raw_repository&.root_ref
end
cache_method :root_ref
cache_method_asymmetrically :root_ref
# Gitaly migration: https://gitlab.com/gitlab-org/gitaly/issues/314
def exists?

View file

@ -0,0 +1,5 @@
---
title: Cache Repository#root_ref within a request
merge_request: 25903
author:
type: performance

View file

@ -1095,6 +1095,49 @@ describe Repository do
end
end
shared_examples 'asymmetric cached method' do |method|
context 'asymmetric caching', :use_clean_rails_memory_store_caching, :request_store do
let(:cache) { repository.send(:cache) }
let(:request_store_cache) { repository.send(:request_store_cache) }
context 'when it returns true' do
before do
expect(repository.raw_repository).to receive(method).once.and_return(true)
end
it 'caches the output in RequestStore' do
expect do
repository.send(method)
end.to change { request_store_cache.read(method) }.from(nil).to(true)
end
it 'caches the output in RepositoryCache' do
expect do
repository.send(method)
end.to change { cache.read(method) }.from(nil).to(true)
end
end
context 'when it returns false' do
before do
expect(repository.raw_repository).to receive(method).once.and_return(false)
end
it 'caches the output in RequestStore' do
expect do
repository.send(method)
end.to change { request_store_cache.read(method) }.from(nil).to(false)
end
it 'does NOT cache the output in RepositoryCache' do
expect do
repository.send(method)
end.not_to change { cache.read(method) }.from(nil)
end
end
end
end
describe '#exists?' do
it 'returns true when a repository exists' do
expect(repository.exists?).to be(true)
@ -1112,46 +1155,7 @@ describe Repository do
end
end
context 'asymmetric caching', :use_clean_rails_memory_store_caching, :request_store do
let(:cache) { repository.send(:cache) }
let(:request_store_cache) { repository.send(:request_store_cache) }
context 'when it returns true' do
before do
expect(repository.raw_repository).to receive(:exists?).once.and_return(true)
end
it 'caches the output in RequestStore' do
expect do
repository.exists?
end.to change { request_store_cache.read(:exists?) }.from(nil).to(true)
end
it 'caches the output in RepositoryCache' do
expect do
repository.exists?
end.to change { cache.read(:exists?) }.from(nil).to(true)
end
end
context 'when it returns false' do
before do
expect(repository.raw_repository).to receive(:exists?).once.and_return(false)
end
it 'caches the output in RequestStore' do
expect do
repository.exists?
end.to change { request_store_cache.read(:exists?) }.from(nil).to(false)
end
it 'does NOT cache the output in RepositoryCache' do
expect do
repository.exists?
end.not_to change { cache.read(:exists?) }.from(nil)
end
end
end
it_behaves_like 'asymmetric cached method', :exists?
end
describe '#has_visible_content?' do
@ -1271,6 +1275,8 @@ describe Repository do
repository.root_ref
repository.root_ref
end
it_behaves_like 'asymmetric cached method', :root_ref
end
describe '#expire_root_ref_cache' do