forked from fedi/mastodon
Fix #16 - Optimize n+1 queries when checking reblogged/favourited values for status lists in API
This commit is contained in:
parent
1de2833f30
commit
de1f3aab86
app
controllers
models
views/api/v1
|
@ -25,6 +25,7 @@ class Api::V1::AccountsController < ApiController
|
||||||
|
|
||||||
def statuses
|
def statuses
|
||||||
@statuses = @account.statuses.with_includes.with_counters.paginate_by_max_id(20, params[:max_id], params[:since_id]).to_a
|
@statuses = @account.statuses.with_includes.with_counters.paginate_by_max_id(20, params[:max_id], params[:since_id]).to_a
|
||||||
|
set_maps(@statuses)
|
||||||
end
|
end
|
||||||
|
|
||||||
def follow
|
def follow
|
||||||
|
@ -53,7 +54,7 @@ class Api::V1::AccountsController < ApiController
|
||||||
|
|
||||||
def relationships
|
def relationships
|
||||||
ids = params[:id].is_a?(Enumerable) ? params[:id].map(&:to_i) : [params[:id].to_i]
|
ids = params[:id].is_a?(Enumerable) ? params[:id].map(&:to_i) : [params[:id].to_i]
|
||||||
@accounts = Account.find(ids)
|
@accounts = Account.where(id: ids).select('id')
|
||||||
@following = Account.following_map(ids, current_user.account_id)
|
@following = Account.following_map(ids, current_user.account_id)
|
||||||
@followed_by = Account.followed_by_map(ids, current_user.account_id)
|
@followed_by = Account.followed_by_map(ids, current_user.account_id)
|
||||||
@blocking = Account.blocking_map(ids, current_user.account_id)
|
@blocking = Account.blocking_map(ids, current_user.account_id)
|
||||||
|
|
|
@ -10,6 +10,7 @@ class Api::V1::StatusesController < ApiController
|
||||||
@status = Status.find(params[:id])
|
@status = Status.find(params[:id])
|
||||||
@ancestors = @status.ancestors
|
@ancestors = @status.ancestors
|
||||||
@descendants = @status.descendants
|
@descendants = @status.descendants
|
||||||
|
set_maps([@status] + @ancestors + @descendants)
|
||||||
end
|
end
|
||||||
|
|
||||||
def create
|
def create
|
||||||
|
@ -46,16 +47,19 @@ class Api::V1::StatusesController < ApiController
|
||||||
|
|
||||||
def home
|
def home
|
||||||
@statuses = Feed.new(:home, current_user.account).get(20, params[:max_id], params[:since_id]).to_a
|
@statuses = Feed.new(:home, current_user.account).get(20, params[:max_id], params[:since_id]).to_a
|
||||||
|
set_maps(@statuses)
|
||||||
render action: :index
|
render action: :index
|
||||||
end
|
end
|
||||||
|
|
||||||
def mentions
|
def mentions
|
||||||
@statuses = Feed.new(:mentions, current_user.account).get(20, params[:max_id], params[:since_id]).to_a
|
@statuses = Feed.new(:mentions, current_user.account).get(20, params[:max_id], params[:since_id]).to_a
|
||||||
|
set_maps(@statuses)
|
||||||
render action: :index
|
render action: :index
|
||||||
end
|
end
|
||||||
|
|
||||||
def public
|
def public
|
||||||
@statuses = Status.as_public_timeline(current_user.account).paginate_by_max_id(20, params[:max_id], params[:since_id]).to_a
|
@statuses = Status.as_public_timeline(current_user.account).paginate_by_max_id(20, params[:max_id], params[:since_id]).to_a
|
||||||
|
set_maps(@statuses)
|
||||||
render action: :index
|
render action: :index
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -35,4 +35,10 @@ class ApiController < ApplicationController
|
||||||
def render_empty
|
def render_empty
|
||||||
render json: {}, status: 200
|
render json: {}, status: 200
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def set_maps(statuses)
|
||||||
|
status_ids = statuses.flat_map { |s| [s.id, s.reblog_of_id] }.compact
|
||||||
|
@reblogs_map = Status.reblogs_map(status_ids, current_user.account)
|
||||||
|
@favourites_map = Status.favourites_map(status_ids, current_user.account)
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -48,6 +48,8 @@ class Account < ApplicationRecord
|
||||||
scope :with_followers, -> { where('(select count(f.id) from follows as f where f.target_account_id = accounts.id) > 0') }
|
scope :with_followers, -> { where('(select count(f.id) from follows as f where f.target_account_id = accounts.id) > 0') }
|
||||||
scope :expiring, -> (time) { where(subscription_expires_at: nil).or(where('subscription_expires_at < ?', time)).remote.with_followers }
|
scope :expiring, -> (time) { where(subscription_expires_at: nil).or(where('subscription_expires_at < ?', time)).remote.with_followers }
|
||||||
|
|
||||||
|
scope :with_counters, -> { select('accounts.*, (select count(f.id) from follows as f where f.target_account_id = accounts.id) as followers_count, (select count(f.id) from follows as f where f.account_id = accounts.id) as following_count, (select count(s.id) from statuses as s where s.account_id = accounts.id) as statuses_count') }
|
||||||
|
|
||||||
def follow!(other_account)
|
def follow!(other_account)
|
||||||
active_relationships.where(target_account: other_account).first_or_create!(target_account: other_account)
|
active_relationships.where(target_account: other_account).first_or_create!(target_account: other_account)
|
||||||
end
|
end
|
||||||
|
|
|
@ -22,7 +22,7 @@ END
|
||||||
|
|
||||||
account_ids = results['data'].map(&:first)
|
account_ids = results['data'].map(&:first)
|
||||||
blocked_ids = Block.where(account_id: for_account_id).pluck(:target_account_id)
|
blocked_ids = Block.where(account_id: for_account_id).pluck(:target_account_id)
|
||||||
accounts_map = Account.where(id: account_ids - blocked_ids).map { |a| [a.id, a] }.to_h
|
accounts_map = Account.where(id: account_ids - blocked_ids).with_counters.map { |a| [a.id, a] }.to_h
|
||||||
|
|
||||||
account_ids.map { |id| accounts_map[id] }.compact
|
account_ids.map { |id| accounts_map[id] }.compact
|
||||||
rescue Neography::NeographyError, Excon::Error::Socket => e
|
rescue Neography::NeographyError, Excon::Error::Socket => e
|
||||||
|
|
|
@ -2,7 +2,7 @@ class Status < ApplicationRecord
|
||||||
include Paginable
|
include Paginable
|
||||||
include Streamable
|
include Streamable
|
||||||
|
|
||||||
belongs_to :account, inverse_of: :statuses
|
belongs_to :account, -> { with_counters }, inverse_of: :statuses
|
||||||
|
|
||||||
belongs_to :thread, foreign_key: 'in_reply_to_id', class_name: 'Status', inverse_of: :replies
|
belongs_to :thread, foreign_key: 'in_reply_to_id', class_name: 'Status', inverse_of: :replies
|
||||||
belongs_to :reblog, foreign_key: 'reblog_of_id', class_name: 'Status', inverse_of: :reblogs
|
belongs_to :reblog, foreign_key: 'reblog_of_id', class_name: 'Status', inverse_of: :reblogs
|
||||||
|
@ -90,11 +90,11 @@ class Status < ApplicationRecord
|
||||||
end
|
end
|
||||||
|
|
||||||
def self.favourites_map(status_ids, account_id)
|
def self.favourites_map(status_ids, account_id)
|
||||||
Favourite.where(status_id: status_ids).where(account_id: account_id).map { |f| [f.status_id, true] }.to_h
|
Favourite.select('status_id').where(status_id: status_ids).where(account_id: account_id).map { |f| [f.status_id, true] }.to_h
|
||||||
end
|
end
|
||||||
|
|
||||||
def self.reblogs_map(status_ids, account_id)
|
def self.reblogs_map(status_ids, account_id)
|
||||||
where(reblog_of_id: status_ids).where(account_id: account_id).map { |s| [s.reblog_of_id, true] }.to_h
|
select('reblog_of_id').where(reblog_of_id: status_ids).where(account_id: account_id).map { |s| [s.reblog_of_id, true] }.to_h
|
||||||
end
|
end
|
||||||
|
|
||||||
before_validation do
|
before_validation do
|
||||||
|
|
|
@ -5,6 +5,6 @@ attributes :id, :username, :acct, :display_name, :note
|
||||||
node(:url) { |account| TagManager.instance.url_for(account) }
|
node(:url) { |account| TagManager.instance.url_for(account) }
|
||||||
node(:avatar) { |account| full_asset_url(account.avatar.url(:large, false)) }
|
node(:avatar) { |account| full_asset_url(account.avatar.url(:large, false)) }
|
||||||
node(:header) { |account| full_asset_url(account.header.url(:medium, false)) }
|
node(:header) { |account| full_asset_url(account.header.url(:medium, false)) }
|
||||||
node(:followers_count) { |account| account.followers.count }
|
node(:followers_count) { |account| account.try(:followers_count) || account.followers.count }
|
||||||
node(:following_count) { |account| account.following.count }
|
node(:following_count) { |account| account.try(:following_count) || account.following.count }
|
||||||
node(:statuses_count) { |account| account.statuses.count }
|
node(:statuses_count) { |account| account.try(:statuses_count) || account.statuses.count }
|
||||||
|
|
|
@ -6,8 +6,8 @@ node(:content) { |status| Formatter.instance.format(status) }
|
||||||
node(:url) { |status| TagManager.instance.url_for(status) }
|
node(:url) { |status| TagManager.instance.url_for(status) }
|
||||||
node(:reblogs_count) { |status| status.reblogs_count }
|
node(:reblogs_count) { |status| status.reblogs_count }
|
||||||
node(:favourites_count) { |status| status.favourites_count }
|
node(:favourites_count) { |status| status.favourites_count }
|
||||||
node(:favourited, if: proc { !current_account.nil? }) { |status| current_account.favourited?(status) }
|
node(:favourited, if: proc { !current_account.nil? }) { |status| defined?(@favourites_map) ? !!@favourites_map[status.id] : current_account.favourited?(status) }
|
||||||
node(:reblogged, if: proc { !current_account.nil? }) { |status| current_account.reblogged?(status) }
|
node(:reblogged, if: proc { !current_account.nil? }) { |status| defined?(@reblogs_map) ? !!@reblogs_map[status.id] : current_account.reblogged?(status) }
|
||||||
|
|
||||||
child :reblog => :reblog do
|
child :reblog => :reblog do
|
||||||
extends('api/v1/statuses/show')
|
extends('api/v1/statuses/show')
|
||||||
|
|
Loading…
Reference in a new issue