Optimise and Refactor Org.with_template_and_user_counts
#3431
+8
−7
Conversation
This file contains 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
`app/views/paginable/orgs/_index.html.erb` was performing the following check: `<% unless org.user_count > 0 || org.template_count > 0 || org.contributors.length > 0 || org.plans.length > 0 %>` - However, `org.template_count` is the only value that is actually used (line 19 in `app/views/paginable/orgs/_index.html.erb` `<td><%= org.template_count %></td>`) - Rather than unnecessarily computing the counts of the other values (`org.user_count`, `org.contributors.length`, and `org.plans.length`), we only need to know if at least one record exists for each. Thus, `scope :with_template_and_user_counts` in `app/models/org.rb` is modified to perform these EXISTS queries. - Adding the EXISTS queries for `contributors` and `plans` to `scope :with_template_and_user_counts` also resolves a `USE eager loading detected` warning from the Bullet gem.
- This is a small addition to commit 6708697. - Rather than using all of the virtual attributes (org.has_users, org.has_contributors, org.has_plans), we 'combine' them into org.has_associations. - Basically, has_associations == (org.has_users || org.has_contributors || org.has_plans) - The corresponding changes are also made in app/views/paginable/orgs/_index.html.erb
- To reflect the behaviour changes to Org.with_template_and_user_counts (commits 6708697 and d335d4d), the scope has been renamed to Org.with_template_count_and_associations_check). - joins('LEFT OUTER JOIN templates ON orgs.id = templates.org_id') has been replaced with left_outer_joins(:templates)
Generated by 🚫 Danger |
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.
Changes proposed in this PR:
app/models/org.rbscope :with_template_and_user_counts. It is now significantly faster (see table at bottom of description).app/views/paginable/orgs/_index.html.erbapp/models/org.rb.deleteoption enabled. These PR changes should result in the same exact Orgs having thedeleteoption enabled as before.Refactoring:
To reflect these changes,
scope: Org.with_template_and_user_countshas been renamed toscope: Org.with_template_count_and_associations_checkthroughout the codebase.In
app/models/org.rb,joins('LEFT OUTER JOIN templates ON orgs.id = templates.org_id')has been replaced with the equivalentleft_outer_joins(:templates)The following table compares the
developmentbranch toaaron/optimize-scope-with_template_and_user_countsby making requests to the various paths affected by this PR. The benchmarking was performed via ab - Apache HTTP server benchmarking tool alongside a recent (May 2024) db dump from the production environment of DMP Assistant. In both cases, 100 consecutive requests were performed to each path and the recorded result is the mean request time (ms).