A platform for community discussion. Free, open, simple.
PERF: Batch the acting user behind each author penalty
Régis Hanola7fcb37b5b90
diff --git a/app/controllers/reviewables_controller.rb b/app/controllers/reviewables_controller.rbindex b5f65a864ed..cec2ab58119 100644--- a/app/controllers/reviewables_controller.rb+++ b/app/controllers/reviewables_controller.rb@@ -56,6 +56,7 @@ class ReviewablesController < ApplicationControllerReviewable.list_for(current_user, **filters.merge(limit: PER_PAGE, offset: offset)).to_aclaimed_topics = ReviewableClaimedTopic.claimed_hash(reviewables.map { |r| r.topic_id }.uniq)+ Reviewable.preload_author_penalties(reviewables)# This is a bit awkward, but ActiveModel serializers doesn't seem to serialize STI. Note `hash`# is mutated by the serializer and contains the side loaded records which must be merged in the end.diff --git a/app/models/reviewable.rb b/app/models/reviewable.rbindex 3806ec8b26b..45922f20bdb 100644--- a/app/models/reviewable.rb+++ b/app/models/reviewable.rb@@ -342,6 +342,13 @@ class Reviewable < ActiveRecord::Base)end+ def self.preload_author_penalties(reviewables)+ histories = reviewables.flat_map(&:author_penalties).filter_map(&:history)+ return if histories.empty?++ ActiveRecord::Associations::Preloader.new(records: histories, associations: :acting_user).call+ end+def author_penalties@author_penalties ||= AuthorPenalty.all_for(target_created_by, target_post:, reviewable_id: id)enddiff --git a/spec/requests/reviewables_controller_spec.rb b/spec/requests/reviewables_controller_spec.rbindex 13e237457ae..7ed56d1d28f 100644--- a/spec/requests/reviewables_controller_spec.rb+++ b/spec/requests/reviewables_controller_spec.rb@@ -50,6 +50,27 @@ RSpec.describe ReviewablesController doexpect(json["reviewables"]).to eq([])end+ it "loads the acting user behind every author penalty in one query" do+ silencers =+ 3.times.map do+ author = Fabricate(:user, refresh_auto_groups: true)+ flagged_post = Fabricate(:post, user: author)+ silencer = Fabricate(:moderator)+ UserSilencer.silence(author, silencer, post_id: flagged_post.id)+ PostActionCreator.spam(Fabricate(:user, refresh_auto_groups: true), flagged_post)+ silencer+ end++ queries = track_sql_queries { get "/review.json" }++ loaded_one_by_one =+ silencers.select do |silencer|+ queries.any? { |sql| sql.include?(%Q("users"."id" = #{silencer.id} LIMIT 1)) }+ end++ expect(loaded_one_by_one).to eq([])+ end+it "returns JSON with reviewable content" doreviewable = Fabricate(:reviewable_flagged_post)