Fix Cache::NullStore with local caching for repeated reads

fatkodima · fatkodima · commit a8e88e2e4f15 · 2023-08-02T02:25:36.000+03:00
diff --git a/activesupport/lib/active_support/cache/strategy/local_cache.rb b/activesupport/lib/active_support/cache/strategy/local_cache.rb
@@ -124,7 +124,7 @@ def read_multi_entries(keys, **options)
 
 local_entries = local_cache.read_multi_entries(keys)
 local_entries.transform_values! do |payload|
- deserialize_entry(payload).value
+ deserialize_entry(payload)&.value
 end
 missed_keys = keys - local_entries.keys
 
diff --git a/activesupport/test/cache/stores/null_store_test.rb b/activesupport/test/cache/stores/null_store_test.rb
@@ -56,4 +56,14 @@ def test_local_store_strategy
 end
 assert_nil @cache.read("name")
 end
+
+ def test_local_store_repeated_reads
+ @cache.with_local_cache do
+ @cache.read("foo")
+ assert_nil @cache.read("foo")
+
+ @cache.read_multi("foo", "bar")
+ assert_equal({"foo" => nil, "bar" => nil }, @cache.read_multi("foo", "bar"))
+ end
+ end
 end

-Original file line number
+Diff line change
 local_entries=local_cache.read_multi_entries(keys)
 local_entries.transform_values!do |payload|
 -deserialize_entry(payload).value
 +deserialize_entry(payload)&.value
 end
 missed_keys=keys - local_entries.keys
-Original file line number
+Diff line change
 end
 assert_nil@cache.read("name")
 end
++
 +deftest_local_store_repeated_reads
 +@cache.with_local_cachedo
 +@cache.read("foo")
 +assert_nil@cache.read("foo")
++
 +@cache.read_multi("foo","bar")
 +assert_equal({"foo"=>nil,"bar"=>nil},@cache.read_multi("foo","bar"))
 +end
 +end
 end