Skip to content

Commit

Permalink
Use Status.group instead of Status.distinct in HashQueryService
Browse files Browse the repository at this point in the history
DISTINCT clause removes duplicated records according to all the selected
attributes. In reality, it can remove duplicated records only looking at
statuses.id, but the clause confuses the query planner and yields
insufficient performance.
The behavior is also problematic if the scope produced by HashQueryService
is used to query columns without id (using pluck method, for example). The
scope is expected to contain unique statuses, but the uniquness will be
evaluated with some arbitrary columns other than id.

GROUP BY clause resolves those problem by explicitly specifying the
column to take into account for the record distinction.

A workaround for the problem of DISTINCT clause in
Api::V1::Timelines::TagController is no longer necessary and removed.
  • Loading branch information
akihikodaki committed Aug 25, 2020
1 parent 9cadd40 commit 6da24aa
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
4 changes: 1 addition & 3 deletions app/controllers/api/v1/timelines/tag_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,7 @@ def tagged_statuses
)

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)
else
statuses
end
Expand Down
2 changes: 1 addition & 1 deletion app/services/hashtag_query_service.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ def call(tag, params, account = nil, local = false)
all = tags_for(params[:all])
none = tags_for(params[:none])

Status.distinct
Status.group(:id)
.as_tag_timeline(tags, account, local)
.tagged_with_all(all)
.tagged_with_none(none)
Expand Down

0 comments on commit 6da24aa

Please sign in to comment.