Skip to content

A platform for community discussion. Free, open, simple.

PERF: Cache nil bookmark and reviewable lookups in PostSerializer (#44544)

Régis Hanol2a285b5aa6d0
diff --git a/app/serializers/post_serializer.rb b/app/serializers/post_serializer.rb
index d6af3c2d8c0..c503bedb457 100644
--- a/app/serializers/post_serializer.rb
+++ b/app/serializers/post_serializer.rb
@@ -469,10 +469,12 @@ class PostSerializer < BasicPostSerializer
end
def post_bookmark
+ return @post_bookmark if defined?(@post_bookmark)
+
if @topic_view.present?
- @post_bookmark ||= @topic_view.bookmarks.find { |bookmark| bookmark.bookmarkable == object }
+ @post_bookmark = @topic_view.bookmarks.find { |bookmark| bookmark.bookmarkable == object }
else
- @post_bookmark ||= Bookmark.find_by(user: scope.user, bookmarkable: object)
+ @post_bookmark = Bookmark.find_by(user: scope.user, bookmarkable: object)
end
end
@@ -754,7 +756,9 @@ class PostSerializer < BasicPostSerializer
end
def reviewable
- @reviewable ||=
+ return @reviewable if defined?(@reviewable)
+
+ @reviewable =
Reviewable
.where(target: object, type: Reviewable.sti_names)
.includes(:reviewable_scores)
diff --git a/spec/serializers/post_serializer_spec.rb b/spec/serializers/post_serializer_spec.rb
index 0cedca83cca..5ea263ecc2b 100644
--- a/spec/serializers/post_serializer_spec.rb
+++ b/spec/serializers/post_serializer_spec.rb
@@ -477,6 +477,20 @@ RSpec.describe PostSerializer do
end
end
+ context "without a bookmark or reviewable" do
+ fab!(:moderator)
+
+ it "queries bookmarks and reviewables only once" do
+ queries =
+ track_sql_queries do
+ PostSerializer.new(post, scope: moderator.guardian, root: false).as_json
+ end
+
+ expect(queries.count { |q| q.include?('FROM "bookmarks"') }).to eq(1)
+ expect(queries.count { |q| q.include?('FROM "reviewables"') }).to eq(1)
+ end
+ end
+
context "with posts when group moderation is enabled" do
fab!(:topic)
fab!(:group_user)