Skip to content

Reduce memory usage by deduping strings and simplifying hash builder #477

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.

Sign up for GitHub

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

Open
connorshea wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Reduce memory usage by deduping strings and simplifying hash builder #477

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions lib/enumerize/attribute.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,12 @@ def initialize(klass, name, options={})
value_class = options.fetch(:value_class, Value)
@values = Array(options[:in]).map { |v| value_class.new(self, *v).freeze }

@value_hash = Hash[@values.map { |v| [v.value.to_s, v] }]
@value_hash.merge! Hash[@values.map { |v| [v.to_s, v] }]
# Two passes (value keys first, then name keys) so that name keys win on
# collision, matching the previous Hash#merge! behavior, without building
# the intermediate arrays and hashes that merge! required.
@value_hash = {}
@values.each { |v| @value_hash[v.value.to_s] = v }
@values.each { |v| @value_hash[v.to_s] = v }

if options[:default]
@default_value = find_default_value(options[:default])
Expand Down
6 changes: 5 additions & 1 deletion lib/enumerize/value.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,11 @@ class Value < String

def initialize(attr, name, value=nil)
@attr = attr
@value = value.nil? ? name.to_s : value
# Deduplicate the frozen string for plain-symbol enums so every value
# named e.g. "active" across the whole app shares one String object. It
# stays a plain (non-Value) String, so it's still safe to feed to
# write_attribute and friends.
@value = value.nil? ? -name.to_s : value

super(name.to_s)

Expand Down