tykayn/mastodon
1
0
Fork 0
mirror of https://framagit.org/tykayn/mastodon.git synced 2023-08-25 08:33:12 +02:00
Code Issues Projects Releases Wiki Activity

Further abstract caching for includes

Browse Source
This commit is contained in:
Eugen Rochko 2016-11-30 15:57:56 +01:00
parent 356d3874eb
commit a21bcac9e1
4 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/application_controller.rb
View File

@ -59,6 +59,8 @@ class ApplicationController < ActionController::Base
end end
def cache_collection(raw, klass) def cache_collection(raw, klass)
return raw unless klass.respond_to?(:with_includes)
uncached_ids = [] uncached_ids = []
cached_keys_with_value = Rails.cache.read_multi(*raw.map(&:cache_key)) cached_keys_with_value = Rails.cache.read_multi(*raw.map(&:cache_key))

15
app/models/concerns/cacheable.rb Normal file
View File

@ -0,0 +1,15 @@
# frozen_string_literal: true
module Cacheable
extend ActiveSupport::Concern
class_methods do
def cache_associated(*associations)
@cache_associated = associations
end
end
included do
scope :with_includes, -> { includes(@cache_associated) }
end
end

3
app/models/notification.rb
View File

@ -2,6 +2,7 @@
class Notification < ApplicationRecord class Notification < ApplicationRecord
include Paginable include Paginable
include Cacheable
belongs_to :account belongs_to :account
belongs_to :activity, polymorphic: true belongs_to :activity, polymorphic: true
@ -15,7 +16,7 @@ class Notification < ApplicationRecord
STATUS_INCLUDES = [:account, :stream_entry, :media_attachments, :tags, mentions: :account, reblog: [:stream_entry, :account, :media_attachments, :tags, mentions: :account]].freeze STATUS_INCLUDES = [:account, :stream_entry, :media_attachments, :tags, mentions: :account, reblog: [:stream_entry, :account, :media_attachments, :tags, mentions: :account]].freeze
scope :with_includes, -> { includes(status: STATUS_INCLUDES, mention: [status: STATUS_INCLUDES], favourite: [:account, status: STATUS_INCLUDES], follow: :account) } cache_associated status: STATUS_INCLUDES, mention: [status: STATUS_INCLUDES], favourite: [:account, status: STATUS_INCLUDES], follow: :account
def activity def activity
send(activity_type.downcase) send(activity_type.downcase)

4
app/models/status.rb
View File

@ -3,6 +3,7 @@
class Status < ApplicationRecord class Status < ApplicationRecord
include Paginable include Paginable
include Streamable include Streamable
include Cacheable
belongs_to :account, inverse_of: :statuses belongs_to :account, inverse_of: :statuses
@ -27,7 +28,8 @@ class Status < ApplicationRecord
default_scope { order('id desc') } default_scope { order('id desc') }
scope :with_counters, -> { select('statuses.*, (select count(r.id) from statuses as r where r.reblog_of_id = statuses.id) as reblogs_count, (select count(f.id) from favourites as f where f.status_id = statuses.id) as favourites_count') } scope :with_counters, -> { select('statuses.*, (select count(r.id) from statuses as r where r.reblog_of_id = statuses.id) as reblogs_count, (select count(f.id) from favourites as f where f.status_id = statuses.id) as favourites_count') }
scope :with_includes, -> { includes(:account, :media_attachments, :tags, :stream_entry, mentions: :account, reblog: [:account, :stream_entry, :tags, :media_attachments, mentions: :account], thread: :account) }
cache_associated :account, :media_attachments, :tags, :stream_entry, mentions: :account, reblog: [:account, :stream_entry, :tags, :media_attachments, mentions: :account], thread: :account
def local? def local?
uri.nil? uri.nil?