Conversation
This branch has not been deployed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Pull Request Checklist
AO3-1234 Fix thing)Issue
https://otwarchive.atlassian.net/browse/AO3-4438
Purpose
Bookmark.for_blurbincludes the bookmarkable, but since it's polymorphic it can't preload each type's own blurb associations, so uncached blurbs query pseuds, collections, and stat counters once per bookmark (~15 queries per bookmark on a user's bookmarks page).This overrides
Bookmark.load_from_elasticsearchto add a preload pass that groups bookmarkables by class and applies each class'sfor_blurbincludes. That brings the user listing from ~15 down to ~10 queries per bookmark (a default page of 20 bookmarks goes from ~320 to ~230 queries), the same uncached blurb cost the works listing has. The base method inlib/searchable.rbsays "Override for special behavior", andBookmarkableDecoratoralready does the same.The uncached user-listing spec is the one that fails without the fix. The tag and cached specs pass on master already, they're there to cover both listings from the issue and catch regressions.
Testing Instructions
Automated tests are the main verification here (
spec/requests/bookmarks_n_plus_one_spec.rb). To see it by hand in a dev environment:/users/<user>/bookmarksand watch the SQL log: before this change there's oneStatCounter/Pseud/Collectionquery per bookmarked work; after it, one batchedIN (...)query per association.Credit
Pablo Monfort (he/him)