mirror of
https://github.com/discourse/discourse.git
synced 2025-05-22 22:43:33 +08:00
PERF: Eager load Theme associations in Stylesheet Manager.
Before this change, calling `StyleSheet::Manager.stylesheet_details` for the first time resulted in multiple queries to the database. This is because the code was modelled in a way where each `Theme` was loaded from the database one at a time. This PR restructures the code such that it allows us to load all the theme records in a single query. It also allows us to eager load the required associations upfront. In order to achieve this, I removed the support of loading multiple themes per request. It was initially added to support user selectable theme components but the feature was never completed and abandoned because it wasn't a feature that we thought was worth building.
This commit is contained in:
@ -19,7 +19,8 @@ class StylesheetsController < ApplicationController
|
||||
params.require("id")
|
||||
params.permit("theme_id")
|
||||
|
||||
stylesheet = Stylesheet::Manager.color_scheme_stylesheet_details(params[:id], 'all', params[:theme_id])
|
||||
manager = Stylesheet::Manager.new(theme_id: params[:theme_id])
|
||||
stylesheet = manager.color_scheme_stylesheet_details(params[:id], 'all')
|
||||
render json: stylesheet
|
||||
end
|
||||
protected
|
||||
@ -40,16 +41,19 @@ class StylesheetsController < ApplicationController
|
||||
# we hold off re-compilation till someone asks for asset
|
||||
if target.include?("color_definitions")
|
||||
split_target, color_scheme_id = target.split(/_(-?[0-9]+)/)
|
||||
Stylesheet::Manager.color_scheme_stylesheet_link_tag(color_scheme_id)
|
||||
|
||||
Stylesheet::Manager.new.color_scheme_stylesheet_link_tag(color_scheme_id)
|
||||
else
|
||||
if target.include?("theme")
|
||||
split_target, theme_id = target.split(/_(-?[0-9]+)/)
|
||||
theme = Theme.find_by(id: theme_id) if theme_id.present?
|
||||
else
|
||||
split_target, color_scheme_id = target.split(/_(-?[0-9]+)/)
|
||||
theme = Theme.find_by(color_scheme_id: color_scheme_id)
|
||||
end
|
||||
Stylesheet::Manager.stylesheet_link_tag(split_target, nil, theme&.id)
|
||||
theme_id =
|
||||
if target.include?("theme")
|
||||
split_target, theme_id = target.split(/_(-?[0-9]+)/)
|
||||
Theme.where(id: theme_id).pluck_first(:id) if theme_id.present?
|
||||
else
|
||||
split_target, color_scheme_id = target.split(/_(-?[0-9]+)/)
|
||||
Theme.where(color_scheme_id: color_scheme_id).pluck_first(:id)
|
||||
end
|
||||
|
||||
Stylesheet::Manager.new(theme_id: theme_id).stylesheet_link_tag(split_target, nil)
|
||||
end
|
||||
end
|
||||
|
||||
|
Reference in New Issue
Block a user