mirror of
https://github.com/mastodon/mastodon.git
synced 2024-11-22 14:15:22 +00:00
Replace incorrect use of distinct with group (#14675)
Some uses of ActiveRecord::QueryMethods#distinct pass field names but they
are incorrect for the current version of Rails.
ActiveRecord::QueryMethods#group provides the expected behavior and
benefits performance. See commit 6da24aad4c
.
This commit is contained in:
parent
552e886b64
commit
e26e7a1cb5
|
@ -41,17 +41,7 @@ class Api::V1::Accounts::StatusesController < Api::BaseController
|
||||||
end
|
end
|
||||||
|
|
||||||
def only_media_scope
|
def only_media_scope
|
||||||
Status.where(id: account_media_status_ids)
|
Status.joins(:media_attachments).merge(@account.media_attachments.reorder(nil)).group(:id)
|
||||||
end
|
|
||||||
|
|
||||||
def account_media_status_ids
|
|
||||||
# `SELECT DISTINCT id, updated_at` is too slow, so pluck ids at first, and then select id, updated_at with ids.
|
|
||||||
# Also, Avoid getting slow by not narrowing down by `statuses.account_id`.
|
|
||||||
# When narrowing down by `statuses.account_id`, `index_statuses_20180106` will be used
|
|
||||||
# and the table will be joined by `Merge Semi Join`, so the query will be slow.
|
|
||||||
@account.statuses.joins(:media_attachments).merge(@account.media_attachments).permitted_for(@account, current_account)
|
|
||||||
.paginate_by_max_id(limit_param(DEFAULT_STATUSES_LIMIT), params[:max_id], params[:since_id])
|
|
||||||
.reorder(id: :desc).distinct(:id).pluck(:id)
|
|
||||||
end
|
end
|
||||||
|
|
||||||
def pinned_scope
|
def pinned_scope
|
||||||
|
|
|
@ -30,9 +30,7 @@ class Api::V1::Timelines::PublicController < Api::BaseController
|
||||||
)
|
)
|
||||||
|
|
||||||
if truthy_param?(:only_media)
|
if truthy_param?(:only_media)
|
||||||
# `SELECT DISTINCT id, updated_at` is too slow, so pluck ids at first, and then select id, updated_at with ids.
|
statuses.joins(:media_attachments).group(:id)
|
||||||
status_ids = statuses.joins(:media_attachments).distinct(:id).pluck(:id)
|
|
||||||
statuses.where(id: status_ids)
|
|
||||||
else
|
else
|
||||||
statuses
|
statuses
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in a new issue