Fix Rails cache namespace being overriden with `v2` for cached statuses (#24202)
This commit is contained in:
parent
a7a578a055
commit
2626097869
|
@ -187,7 +187,7 @@ module CacheConcern
|
||||||
return [] if raw.empty?
|
return [] if raw.empty?
|
||||||
|
|
||||||
cached_keys_with_value = begin
|
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
|
rescue ActiveRecordCoder::Error
|
||||||
{} # The serialization format may have changed, let's pretend it's a cache miss.
|
{} # The serialization format may have changed, let's pretend it's a cache miss.
|
||||||
end
|
end
|
||||||
|
@ -200,7 +200,7 @@ module CacheConcern
|
||||||
uncached = klass.where(id: uncached_ids).with_includes.index_by(&:id)
|
uncached = klass.where(id: uncached_ids).with_includes.index_by(&:id)
|
||||||
|
|
||||||
uncached.each_value do |item|
|
uncached.each_value do |item|
|
||||||
Rails.cache.write(item, ActiveRecordCoder.dump(item), namespace: 'v2')
|
Rails.cache.write(item, ActiveRecordCoder.dump(item))
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -140,6 +140,10 @@ class Status < ApplicationRecord
|
||||||
|
|
||||||
REAL_TIME_WINDOW = 6.hours
|
REAL_TIME_WINDOW = 6.hours
|
||||||
|
|
||||||
|
def cache_key
|
||||||
|
"v2:#{super}"
|
||||||
|
end
|
||||||
|
|
||||||
def searchable_by(preloaded = nil)
|
def searchable_by(preloaded = nil)
|
||||||
ids = []
|
ids = []
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue