Optimize usage per site lookup#6098
Merged
aerosol merged 1 commit intosanne-pageviews-site-breakdownfrom Feb 26, 2026
Merged
Conversation
Instead of building a lookup map of all owned site ids, we rely on clickhouse for sorting and limiting results, and only if the resulting set is smaller than the predefined max, a query to fill up inactive sites (zero events) is made.
4 tasks
sanne-san
approved these changes
Feb 26, 2026
github-merge-queue Bot
pushed a commit
that referenced
this pull request
Feb 26, 2026
* Add per-site pageview breakdown to pageview usage section - When a team has between 2 and 10 sites, the expandable pageview usage section now shows a breakdown of pageviews and custom events per site. - Teams with a single site or more than 10 sites see the existing aggregate-only view unchanged. - The breakdown section is expanded by default when no per-site breakdown is present. It is collapsed by default when a per-site breakdown is present, or when previous cycles are also present. * Optimize usage per site lookup (#6098) Instead of building a lookup map of all owned site ids, we rely on clickhouse for sorting and limiting results, and only if the resulting set is smaller than the predefined max, a query to fill up inactive sites (zero events) is made. * Refactor `per_site_usage` in `Teams.Billing` (#6100) --------- Co-authored-by: Adam Rutkowski <hq@mtod.org> Co-authored-by: Adrian Gruntkowski <adrian.gruntkowski@gmail.com>
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
2 participants
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.
PR against #6097
Instead of building a lookup map of all owned site ids,
we rely on clickhouse for sorting and limiting results,
and only if the resulting set is smaller than the predefined max,
a query to fill up inactive sites (zero events) is made.