gearheads
/
mastodon
Archived
2
0
Fork 0
Code Releases 4 Activity

More query optimizations

gh/stable
Eugen Rochko 2016-11-22 23:18:54 +01:00
parent fc90d38893
commit 5c78547198
5 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/controllers/api/v1/timelines_controller.rb
View File

@ -10,6 +10,8 @@ class Api::V1::TimelinesController < ApiController
@statuses = Feed.new(:home, current_account).get(DEFAULT_STATUSES_LIMIT, params[:max_id], params[:since_id]).to_a
set_maps(@statuses)
set_counters_maps(@statuses)
set_account_counters_maps(@statuses.flat_map { |s| [s.account, s.reblog? ? s.reblog.account : nil] }.compact.uniq)
next_path = api_v1_home_timeline_url(max_id: @statuses.last.id) if @statuses.size == DEFAULT_STATUSES_LIMIT
prev_path = api_v1_home_timeline_url(since_id: @statuses.first.id) unless @statuses.empty?
@ -23,6 +25,8 @@ class Api::V1::TimelinesController < ApiController
@statuses = Feed.new(:mentions, current_account).get(DEFAULT_STATUSES_LIMIT, params[:max_id], params[:since_id]).to_a
set_maps(@statuses)
set_counters_maps(@statuses)
set_account_counters_maps(@statuses.flat_map { |s| [s.account, s.reblog? ? s.reblog.account : nil] }.compact.uniq)
next_path = api_v1_mentions_timeline_url(max_id: @statuses.last.id) if @statuses.size == DEFAULT_STATUSES_LIMIT
prev_path = api_v1_mentions_timeline_url(since_id: @statuses.first.id) unless @statuses.empty?
@ -36,6 +40,8 @@ class Api::V1::TimelinesController < ApiController
@statuses = Status.as_public_timeline(current_account).paginate_by_max_id(DEFAULT_STATUSES_LIMIT, params[:max_id], params[:since_id]).to_a
set_maps(@statuses)
set_counters_maps(@statuses)
set_account_counters_maps(@statuses.flat_map { |s| [s.account, s.reblog? ? s.reblog.account : nil] }.compact.uniq)
next_path = api_v1_public_timeline_url(max_id: @statuses.last.id) if @statuses.size == DEFAULT_STATUSES_LIMIT
prev_path = api_v1_public_timeline_url(since_id: @statuses.first.id) unless @statuses.empty?
@ -50,6 +56,8 @@ class Api::V1::TimelinesController < ApiController
@statuses = @tag.nil? ? [] : Status.as_tag_timeline(@tag, current_account).paginate_by_max_id(DEFAULT_STATUSES_LIMIT, params[:max_id], params[:since_id]).to_a
set_maps(@statuses)
set_counters_maps(@statuses)
set_account_counters_maps(@statuses.flat_map { |s| [s.account, s.reblog? ? s.reblog.account : nil] }.compact.uniq)
next_path = api_v1_hashtag_timeline_url(params[:id], max_id: @statuses.last.id) if @statuses.size == DEFAULT_STATUSES_LIMIT
prev_path = api_v1_hashtag_timeline_url(params[:id], since_id: @statuses.first.id) unless @statuses.empty?

4
app/controllers/api_controller.rb
View File

@ -59,11 +59,11 @@ class ApiController < ApplicationController
end
def current_resource_owner
User.find(doorkeeper_token.resource_owner_id) if doorkeeper_token
@user ||= User.find(doorkeeper_token.resource_owner_id) if doorkeeper_token
end
def current_user
super || current_resource_owner
@user ||= super || current_resource_owner
rescue ActiveRecord::RecordNotFound
nil
end

2
app/controllers/application_controller.rb
View File

@ -51,6 +51,6 @@ class ApplicationController < ActionController::Base
end
def current_account
current_user.try(:account)
@account ||= current_user.try(:account)
end
end

2
app/models/feed.rb
View File

@ -16,7 +16,7 @@ class Feed
RegenerationWorker.perform_async(@account.id, @type)
@statuses = Status.send("as_#{@type}_timeline", @account).paginate_by_max_id(limit, nil, nil)
else
status_map = Status.where(id: unhydrated).with_includes.with_counters.map { |status| [status.id, status] }.to_h
status_map = Status.where(id: unhydrated).with_includes.map { |status| [status.id, status] }.to_h
@statuses = unhydrated.map { |id| status_map[id] }.compact
end

4
app/models/status.rb
View File

@ -4,7 +4,7 @@ class Status < ApplicationRecord
include Paginable
include Streamable
belongs_to :account, -> { with_counters }, inverse_of: :statuses
belongs_to :account, inverse_of: :statuses
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, touch: true
@ -27,7 +27,7 @@ class Status < ApplicationRecord
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_includes, -> { includes(:account, :media_attachments, :tags, :stream_entry, mentions: :account, reblog: [:account, mentions: :account], thread: :account) }
scope :with_includes, -> { includes(:account, :media_attachments, :tags, :stream_entry, mentions: :account, reblog: [:account, :stream_entry, :tags, mentions: :account], thread: :account) }
def local?
uri.nil?