Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Unify collection caching code

Browse source
This commit is contained in:
Eugen Rochko 2016-11-29 15:49:39 +01:00
parent 93a90cd9c3
commit 7e90772c92
6 changed files with 30 additions and 87 deletions
Download patch file Download diff file Expand all files Collapse all files

21
app/controllers/api/v1/accounts_controller.rb
View file

@ -48,7 +48,7 @@ class Api::V1::AccountsController < ApiController
def statuses
@statuses = @account.statuses.paginate_by_max_id(DEFAULT_STATUSES_LIMIT, params[:max_id], params[:since_id]).to_a
@statuses = cache(@statuses)
@statuses = cache_collection(@statuses, Status)
set_maps(@statuses)
set_counters_maps(@statuses)
@ -111,23 +111,4 @@ class Api::V1::AccountsController < ApiController
@followed_by = Account.followed_by_map([@account.id], current_user.account_id)
@blocking = Account.blocking_map([@account.id], current_user.account_id)
end
def cache(raw)
uncached_ids = []
cached_keys_with_value = Rails.cache.read_multi(*raw.map(&:cache_key))
raw.each do |status|
uncached_ids << status.id unless cached_keys_with_value.key?(status.cache_key)
end
unless uncached_ids.empty?
uncached = Status.where(id: uncached_ids).with_includes.map { |s| [s.id, s] }.to_h
uncached.values.each do |status|
Rails.cache.write(status.cache_key, status)
end
end
raw.map { |status| cached_keys_with_value[status.cache_key] || uncached[status.id] }.compact
end
end