Commit 6e2a6fd0 authored by Douwe Maan's avatar Douwe Maan

Merge branch '24224-fix-project-ref-cache' into 'master'

Fix lookup of project by unknown ref when caching is enabled

Closes #24224

See merge request !7988
parents 6d9c1d3e f6de2fc5
---
title: Fix lookup of project by unknown ref when caching is enabled
merge_request: 7988
author:
...@@ -254,15 +254,26 @@ module Banzai ...@@ -254,15 +254,26 @@ module Banzai
# Returns projects for the given paths. # Returns projects for the given paths.
def find_projects_for_paths(paths) def find_projects_for_paths(paths)
if RequestStore.active? if RequestStore.active?
to_query = paths - project_refs_cache.keys cache = project_refs_cache
to_query = paths - cache.keys
unless to_query.empty? unless to_query.empty?
projects_relation_for_paths(to_query).each do |project| projects = projects_relation_for_paths(to_query)
get_or_set_cache(project_refs_cache, project.path_with_namespace) { project }
found = []
projects.each do |project|
ref = project.path_with_namespace
get_or_set_cache(cache, ref) { project }
found << ref
end
not_found = to_query - found
not_found.each do |ref|
get_or_set_cache(cache, ref) { nil }
end end
end end
project_refs_cache.slice(*paths).values cache.slice(*paths).values.compact
else else
projects_relation_for_paths(paths) projects_relation_for_paths(paths)
end end
......
...@@ -32,13 +32,64 @@ describe Banzai::Filter::AbstractReferenceFilter do ...@@ -32,13 +32,64 @@ describe Banzai::Filter::AbstractReferenceFilter do
end end
describe '#find_projects_for_paths' do describe '#find_projects_for_paths' do
let(:doc) { Nokogiri::HTML.fragment('') }
let(:filter) { described_class.new(doc, project: project) }
context 'with RequestStore disabled' do
it 'returns a list of Projects for a list of paths' do it 'returns a list of Projects for a list of paths' do
doc = Nokogiri::HTML.fragment('') expect(filter.find_projects_for_paths([project.path_with_namespace])).
filter = described_class.new(doc, project: project) to eq([project])
end
it "return an empty array for paths that don't exist" do
expect(filter.find_projects_for_paths(['nonexistent/project'])).
to eq([])
end
end
context 'with RequestStore enabled' do
before do
RequestStore.begin!
end
after do
RequestStore.end!
RequestStore.clear!
end
it 'returns a list of Projects for a list of paths' do
expect(filter.find_projects_for_paths([project.path_with_namespace])). expect(filter.find_projects_for_paths([project.path_with_namespace])).
to eq([project]) to eq([project])
end end
context "when no project with that path exists" do
it "returns no value" do
expect(filter.find_projects_for_paths(['nonexistent/project'])).
to eq([])
end
it "adds the ref to the project refs cache" do
project_refs_cache = {}
allow(filter).to receive(:project_refs_cache).and_return(project_refs_cache)
filter.find_projects_for_paths(['nonexistent/project'])
expect(project_refs_cache).to eq({ 'nonexistent/project' => nil })
end
context 'when the project refs cache includes nil values' do
before do
# adds { 'nonexistent/project' => nil } to cache
filter.project_from_ref_cached('nonexistent/project')
end
it "return an empty array for paths that don't exist" do
expect(filter.find_projects_for_paths(['nonexistent/project'])).
to eq([])
end
end
end
end
end end
describe '#current_project_path' do describe '#current_project_path' do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment