Merge branch 'allow-reactive-caching-of-nil' into 'master'

Allow ReactiveCaching to support nil value

See merge request gitlab-org/gitlab-ce!30456

4 files changed, 40 insertions, 29 deletions

diff --git a/app/models/concerns/reactive_caching.rb b/app/models/concerns/reactive_caching.rb
index 5b3880f94ba..d91be73d6f0 100644
--- a/app/models/concerns/reactive_caching.rb
+++ b/app/models/concerns/reactive_caching.rb
@@ -173,7 +173,11 @@ module ReactiveCaching
     end
 
     def within_reactive_cache_lifetime?(*args)
-      !!Rails.cache.read(alive_reactive_cache_key(*args))
+      if Feature.enabled?(:reactive_caching_check_key_exists, default_enabled: true)
+        Rails.cache.exist?(alive_reactive_cache_key(*args))
+      else
+        !!Rails.cache.read(alive_reactive_cache_key(*args))
+      end
     end
 
     def enqueuing_update(*args)
diff --git a/changelogs/unreleased/allow-reactive-caching-of-nil.yml b/changelogs/unreleased/allow-reactive-caching-of-nil.yml
new file mode 100644
index 00000000000..abd88c09d74
--- /dev/null
+++ b/changelogs/unreleased/allow-reactive-caching-of-nil.yml
@@ -0,0 +1,5 @@
+---
+title: Allow ReactiveCaching to support nil value
+merge_request: 30456
+author:
+type: performance
diff --git a/spec/models/concerns/reactive_caching_spec.rb b/spec/models/concerns/reactive_caching_spec.rb
index e2ab9ddd4a5..3d026932f59 100644
--- a/spec/models/concerns/reactive_caching_spec.rb
+++ b/spec/models/concerns/reactive_caching_spec.rb
@@ -47,30 +47,12 @@ describe ReactiveCaching, :use_clean_rails_memory_store_caching do
 
     subject(:go!) { instance.result }
 
-    context 'when cache is empty' do
-      it { is_expected.to be_nil }
-
-      it 'enqueues a background worker to bootstrap the cache' do
-        expect(ReactiveCachingWorker).to receive(:perform_async).with(CacheTest, 666)
-
-        go!
-      end
-
-      it 'updates the cache lifespan' do
-        expect(reactive_cache_alive?(instance)).to be_falsy
-
-        go!
-
-        expect(reactive_cache_alive?(instance)).to be_truthy
-      end
-    end
-
-    context 'when the cache is full' do
+    shared_examples 'a cacheable value' do |cached_value|
       before do
-        stub_reactive_cache(instance, 4)
+        stub_reactive_cache(instance, cached_value)
       end
 
-      it { is_expected.to eq(4) }
+      it { is_expected.to eq(cached_value) }
 
       it 'does not enqueue a background worker' do
         expect(ReactiveCachingWorker).not_to receive(:perform_async)
@@ -90,9 +72,7 @@ describe ReactiveCaching, :use_clean_rails_memory_store_caching do
         end
 
         it { is_expected.to be_nil }
-      end
 
-      context 'when cache was invalidated' do
         it 'refreshes cache' do
           expect(ReactiveCachingWorker).to receive(:perform_async).with(CacheTest, 666)
 
@@ -101,12 +81,34 @@ describe ReactiveCaching, :use_clean_rails_memory_store_caching do
       end
     end
 
-    context 'when cache contains non-nil but blank value' do
-      before do
-        stub_reactive_cache(instance, false)
+    context 'when cache is empty' do
+      it { is_expected.to be_nil }
+
+      it 'enqueues a background worker to bootstrap the cache' do
+        expect(ReactiveCachingWorker).to receive(:perform_async).with(CacheTest, 666)
+
+        go!
       end
 
-      it { is_expected.to eq(false) }
+      it 'updates the cache lifespan' do
+        expect(reactive_cache_alive?(instance)).to be_falsy
+
+        go!
+
+        expect(reactive_cache_alive?(instance)).to be_truthy
+      end
+    end
+
+    context 'when the cache is full' do
+      it_behaves_like 'a cacheable value', 4
+    end
+
+    context 'when the cache contains non-nil but blank value' do
+      it_behaves_like 'a cacheable value', false
+    end
+
+    context 'when the cache contains nil value' do
+      it_behaves_like 'a cacheable value', nil
     end
   end
 
diff --git a/spec/support/helpers/reactive_caching_helpers.rb b/spec/support/helpers/reactive_caching_helpers.rb
index b76b53db0b9..528da37e8cf 100644
--- a/spec/support/helpers/reactive_caching_helpers.rb
+++ b/spec/support/helpers/reactive_caching_helpers.rb
@@ -10,7 +10,7 @@ module ReactiveCachingHelpers
   def stub_reactive_cache(subject = nil, data = nil, *qualifiers)
     allow(ReactiveCachingWorker).to receive(:perform_async)
     allow(ReactiveCachingWorker).to receive(:perform_in)
-    write_reactive_cache(subject, data, *qualifiers) unless data.nil?
+    write_reactive_cache(subject, data, *qualifiers) unless subject.nil?
   end
 
   def synchronous_reactive_cache(subject)