From e26e7a1cb5992375eecedbc10ab9bcef4e603a88 Mon Sep 17 00:00:00 2001
From: Akihiko Odaki <nekomanma@pixiv.co.jp>
Date: Fri, 28 Aug 2020 19:29:59 +0900
Subject: [PATCH] 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 6da24aad4cafdef8d8a2c92bac2002a5fc2fe9c8.
---
.../api/v1/accounts/statuses_controller.rb | 12 +-----------
.../api/v1/timelines/public_controller.rb | 4 +---
2 files changed, 2 insertions(+), 14 deletions(-)
diff --git a/app/controllers/api/v1/accounts/statuses_controller.rb b/app/controllers/api/v1/accounts/statuses_controller.rb
index 114ee0a824..1af768e54b 100644
--- a/app/controllers/api/v1/accounts/statuses_controller.rb
+++ b/app/controllers/api/v1/accounts/statuses_controller.rb
@@ -41,17 +41,7 @@ class Api::V1::Accounts::StatusesController < Api::BaseController
end
def only_media_scope
- Status.where(id: account_media_status_ids)
- 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)
+ Status.joins(:media_attachments).merge(@account.media_attachments.reorder(nil)).group(:id)
end
def pinned_scope
diff --git a/app/controllers/api/v1/timelines/public_controller.rb b/app/controllers/api/v1/timelines/public_controller.rb
index c6e7854d93..6ca903c167 100644
--- a/app/controllers/api/v1/timelines/public_controller.rb
+++ b/app/controllers/api/v1/timelines/public_controller.rb
@@ -30,9 +30,7 @@ class Api::V1::Timelines::PublicController < Api::BaseController
)
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.
- status_ids = statuses.joins(:media_attachments).distinct(:id).pluck(:id)
- statuses.where(id: status_ids)
+ statuses.joins(:media_attachments).group(:id)
else
statuses
end
--
GitLab