diff options
| author | Samuel Giddins <segiddins@segiddins.me> | 2023-09-14 19:34:15 -0700 |
|---|---|---|
| committer | git <svn-admin@ruby-lang.org> | 2023-09-15 17:54:01 +0000 |
| commit | c423d6e0e48bd8a94548ff7a6275d93ae770f9d1 (patch) | |
| tree | 1da67385319147d91714bf0ba78ebca410a45fb6 /lib/bundler/yaml_serializer.rb | |
| parent | 4d86d932fdbe91e436a5680ffae2f4db1a23b3be (diff) | |
[rubygems/rubygems] Stop allocating the same settings keys repeatedly
Running `bundle update --bundler` on a rails app locally:
```
==> memprof.after.txt <==
Total allocated: 301.90 kB (3794 objects)
Total retained: 73.24 kB (698 objects)
==> memprof.before.txt <==
Total allocated: 14.47 MB (196378 objects)
Total retained: 25.93 kB (202 objects)
```
So for a slight increase in retained memory (all keys are now retained),
we go from about 200k allocations in the settings file to under 4k
https://github.com/rubygems/rubygems/commit/e64debb6ae
Diffstat (limited to 'lib/bundler/yaml_serializer.rb')
| -rw-r--r-- | lib/bundler/yaml_serializer.rb | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/lib/bundler/yaml_serializer.rb b/lib/bundler/yaml_serializer.rb index d5ecbd4aef..6e4b44848f 100644 --- a/lib/bundler/yaml_serializer.rb +++ b/lib/bundler/yaml_serializer.rb @@ -54,8 +54,8 @@ module Bundler str.split(/\r?\n/).each do |line| if match = HASH_REGEX.match(line) indent, key, quote, val = match.captures - key = convert_to_backward_compatible_key(key) - depth = indent.scan(/ /).length + convert_to_backward_compatible_key!(key) + depth = indent.size / 2 if quote.empty? && val.empty? new_hash = {} stack[depth][key] = new_hash @@ -76,14 +76,13 @@ module Bundler end # for settings' keys - def convert_to_backward_compatible_key(key) - key = "#{key}/" if key =~ /https?:/i && key !~ %r{/\Z} - key = key.gsub(".", "__") if key.include?(".") - key + def convert_to_backward_compatible_key!(key) + key << "/" if /https?:/i.match?(key) && !%r{/\Z}.match?(key) + key.gsub!(".", "__") end class << self - private :dump_hash, :convert_to_backward_compatible_key + private :dump_hash, :convert_to_backward_compatible_key! end end end |