From 2626097869c9520c21aaba73c9bcfe72c0f25f28 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 22 Mar 2023 15:47:44 +0100
Subject: [PATCH] Fix Rails cache namespace being overriden with `v2` for
cached statuses (#24202)
---
app/controllers/concerns/cache_concern.rb | 4 ++--
app/models/status.rb | 4 ++++
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/app/controllers/concerns/cache_concern.rb b/app/controllers/concerns/cache_concern.rb
index e606218ac..a5a9ba3e1 100644
--- a/app/controllers/concerns/cache_concern.rb
+++ b/app/controllers/concerns/cache_concern.rb
@@ -187,7 +187,7 @@ module CacheConcern
return [] if raw.empty?
cached_keys_with_value = begin
- Rails.cache.read_multi(*raw, namespace: 'v2').transform_keys(&:id).transform_values { |r| ActiveRecordCoder.load(r) }
+ Rails.cache.read_multi(*raw).transform_keys(&:id).transform_values { |r| ActiveRecordCoder.load(r) }
rescue ActiveRecordCoder::Error
{} # The serialization format may have changed, let's pretend it's a cache miss.
end
@@ -200,7 +200,7 @@ module CacheConcern
uncached = klass.where(id: uncached_ids).with_includes.index_by(&:id)
uncached.each_value do |item|
- Rails.cache.write(item, ActiveRecordCoder.dump(item), namespace: 'v2')
+ Rails.cache.write(item, ActiveRecordCoder.dump(item))
end
end
diff --git a/app/models/status.rb b/app/models/status.rb
index 2e32c3f16..2757497db 100644
--- a/app/models/status.rb
+++ b/app/models/status.rb
@@ -140,6 +140,10 @@ class Status < ApplicationRecord
REAL_TIME_WINDOW = 6.hours
+ def cache_key
+ "v2:#{super}"
+ end
+
def searchable_by(preloaded = nil)
ids = []