FreakU
/
mastodon
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix Rails cache namespace being overriden with `v2` for cached statuses (#24202)

This commit is contained in:
Claire 2023-03-22 15:47:44 +01:00 committed by GitHub
parent a7a578a055
commit 2626097869
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/concerns/cache_concern.rb
View File

@ -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

4
app/models/status.rb
View File

@ -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 = []