-
Notifications
You must be signed in to change notification settings - Fork 443
Optimize memory allocation when rendering partials #591
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Changes from 5 commits
86b3946
866d289
c6b9bff
ba3a627
9ca4d05
1245776
8f9993a
8474b41
7e16adf
b7b5abb
6fd6c06
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -118,7 +118,8 @@ def array!(collection = [], *args) | |
options = args.first | ||
|
||
if args.one? && _partial_options?(options) | ||
partial! options.merge(collection: collection) | ||
options[:collection] = collection | ||
partial! options | ||
else | ||
super | ||
end | ||
|
@@ -137,14 +138,14 @@ def set!(name, object = BLANK, *args) | |
private | ||
|
||
def _render_partial_with_options(options) | ||
options.reverse_merge! locals: options.except(:partial, :as, :collection, :cached) | ||
options.reverse_merge! ::JbuilderTemplate.template_lookup_options | ||
options[:locals] ||= options.except(:partial, :as, :collection, :cached) | ||
options[:handlers] ||= ::JbuilderTemplate.template_lookup_options[:handlers] | ||
as = options[:as] | ||
|
||
if as && options.key?(:collection) && CollectionRenderer.supported? | ||
collection = options.delete(:collection) || [] | ||
partial = options.delete(:partial) | ||
options[:locals].merge!(json: self) | ||
options[:locals][:json] = self | ||
collection = EnumerableCompat.new(collection) if collection.respond_to?(:count) && !collection.respond_to?(:size) | ||
|
||
if options.has_key?(:layout) | ||
|
@@ -173,9 +174,10 @@ def _render_partial_with_options(options) | |
locals = options.delete(:locals) | ||
array! collection do |member| | ||
member_locals = locals.clone | ||
member_locals.merge! collection: collection | ||
member_locals.merge! as => member | ||
_render_partial options.merge(locals: member_locals) | ||
member_locals[:collection] = collection | ||
member_locals[as] = member | ||
options[:locals] = member_locals | ||
_render_partial options | ||
end | ||
else | ||
array! | ||
|
@@ -186,8 +188,8 @@ def _render_partial_with_options(options) | |
end | ||
|
||
def _render_partial(options) | ||
options[:locals].merge! json: self | ||
@context.render options | ||
options[:locals][:json] = self | ||
@context.render options, nil | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The That second parameter is intended to be the options you provide to the partial if the first param is the partial name (ex: There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This is the kind of micro optimization that is unnecessary. Let's just not pass the argument. |
||
end | ||
|
||
def _cache_fragment_for(key, options, &block) | ||
|
@@ -242,13 +244,19 @@ def _set_inline_partial(name, object, options) | |
value = if object.nil? | ||
[] | ||
elsif _is_collection?(object) | ||
_scope{ _render_partial_with_options options.merge(collection: object) } | ||
_scope do | ||
options[:collection] = object | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This is now mutating the argument of the method. We should not do it There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I realize this is a private method, so this might be ok, but we should make sure we aren't mutating arguments on public methods. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. In this case, Is whether or not it's ok to mutate just contingent on public vs private methods? Is this simply convention? What are we trying to guard against here? Given the documented DSL with something like my_options = { partial: 'foo', foo: my_foo }
json.foo my_options Or perhaps if/when |
||
_render_partial_with_options options | ||
end | ||
else | ||
locals = ::Hash[options[:as], object] | ||
_scope{ _render_partial_with_options options.merge(locals: locals) } | ||
_scope do | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Same here. Argument is being mutated |
||
options[:locals] = locals | ||
_render_partial_with_options options | ||
end | ||
end | ||
|
||
set! name, value | ||
_set_value name, value | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. We can set the value directly here instead of going back in through This saves a bit in processing and also avoids an extra memory allocation for |
||
end | ||
|
||
def _render_explicit_partial(name_or_options, locals = {}) | ||
|
@@ -259,7 +267,8 @@ def _render_explicit_partial(name_or_options, locals = {}) | |
else | ||
# partial! 'name', locals: {foo: 'bar'} | ||
if locals.one? && (locals.keys.first == :locals) | ||
options = locals.merge(partial: name_or_options) | ||
locals[:partial] = name_or_options | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Mutating the argument. We should avoid it. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This one I don't understand. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This might be a bug already. If we do: locals = { something: 1}
partial! "something", locals
partial! "something_else, locals The call to the second partial should not use the arguments for the first one. That delete should be removed, or we should create a copy of the arguments when entering this method. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Ah ok. This was one of the reasons why I thought there were no issues mutating the options since it was technically being done already. Didn't consider that this may not have been deliberate. I'll try to address this, too. |
||
options = locals | ||
else | ||
options = { partial: name_or_options, locals: locals } | ||
end | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is now mutating the arguments of the method. We should not do it.