Fix slow distinct queries where grouped queries are faster (#15287)

About 2x speed-up on inboxes query

diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rb
index ccb5ef8e86a5760d6a0b58048193bb3fc46db19d..b902ada090ae02692cbb756dd828e7950913d5e2 100644 (file)
--- a/app/controllers/accounts_controller.rb
+++ b/app/controllers/accounts_controller.rb
@@ -81,7 +81,7 @@ class AccountsController < ApplicationController
   end
 
   def account_media_status_ids
-    @account.media_attachments.attached.reorder(nil).select(:status_id).distinct
+    @account.media_attachments.attached.reorder(nil).select(:status_id).group(:status_id)
   end
 
   def no_replies_scope

diff --git a/app/controllers/admin/statuses_controller.rb b/app/controllers/admin/statuses_controller.rb
index 650195034691663baea2e47244abbf5c56da89d0..d7c192f0d6c9ed448d196339421f2f771253f811 100644 (file)
--- a/app/controllers/admin/statuses_controller.rb
+++ b/app/controllers/admin/statuses_controller.rb
@@ -14,7 +14,7 @@ module Admin
       @statuses = @account.statuses.where(visibility: [:public, :unlisted])
 
       if params[:media]
-        account_media_status_ids = @account.media_attachments.attached.reorder(nil).select(:status_id).distinct
+        account_media_status_ids = @account.media_attachments.attached.reorder(nil).select(:status_id).group(:status_id)
         @statuses.merge!(Status.where(id: account_media_status_ids))
       end
 

diff --git a/app/models/account.rb b/app/models/account.rb
index f794d8a2965114384c2e52ba0125092029775441..ed11a514d53e3889542fb8635d27579a16e01ddb 100644 (file)
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -443,7 +443,7 @@ class Account < ApplicationRecord
     end
 
     def inboxes
-      urls = reorder(nil).where(protocol: :activitypub).pluck(Arel.sql("distinct coalesce(nullif(accounts.shared_inbox_url, ''), accounts.inbox_url)"))
+      urls = reorder(nil).where(protocol: :activitypub).group(:preferred_inbox_url).pluck(Arel.sql("coalesce(nullif(accounts.shared_inbox_url, ''), accounts.inbox_url) AS preferred_inbox_url"))
       DeliveryFailureTracker.without_unavailable(urls)
     end
 

diff --git a/app/models/form/account_batch.rb b/app/models/form/account_batch.rb
index 882770d7c8cab4e004a543737d3a56c61e7a281f..26d6d3abfc00a932dd1d18f04f7a2c09053d1cc1 100644 (file)
--- a/app/models/form/account_batch.rb
+++ b/app/models/form/account_batch.rb
@@ -51,7 +51,7 @@ class Form::AccountBatch
   end
 
   def account_domains
-    accounts.pluck(Arel.sql('distinct domain')).compact
+    accounts.group(:domain).pluck(:domain).compact
   end
 
   def accounts