kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

Avoid rehashing keys in transform_values

Browse source 
Previously, calling transform_values would call rb_hash_aset for each
key, needing to rehash it and look up its location.

Instead, we can use rb_hash_stlike_foreach_with_replace to replace the
values as we iterate without rehashing the keys.
This commit is contained in:
John Hawthorn 2019-09-11 09:02:22 -07:00 • committed by Aaron Patterson
parent 14e3731059
commit 21994b7fd6
Notes: git 2019-09-12 06:23:34 +09:00
1 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
hash.c
View file

@ -3129,10 +3129,16 @@ rb_hash_transform_keys_bang(VALUE hash)
} }
static int static int
transform_values_i(VALUE key, VALUE value, VALUE result) transform_values_foreach_func(st_data_t key, st_data_t value, st_data_t argp, int error)
{ {
VALUE new_value = rb_yield(value); return ST_REPLACE;
rb_hash_aset(result, key, new_value); }
static int
transform_values_foreach_replace(st_data_t *key, st_data_t *value, st_data_t argp, int existing)
{
VALUE new_value = rb_yield((VALUE)*value);
*value = new_value;
return ST_CONTINUE; return ST_CONTINUE;
} }
@ -3159,9 +3165,10 @@ rb_hash_transform_values(VALUE hash)
VALUE result; VALUE result;
RETURN_SIZED_ENUMERATOR(hash, 0, 0, hash_enum_size); RETURN_SIZED_ENUMERATOR(hash, 0, 0, hash_enum_size);
result = rb_hash_new_with_size(RHASH_SIZE(hash)); result = hash_dup(hash, rb_cHash, 0);
if (!RHASH_EMPTY_P(hash)) { if (!RHASH_EMPTY_P(hash)) {
rb_hash_foreach(hash, transform_values_i, result); rb_hash_stlike_foreach_with_replace(result, transform_values_foreach_func, transform_values_foreach_replace, 0);
} }
return result; return result;
@ -3189,8 +3196,11 @@ rb_hash_transform_values_bang(VALUE hash)
{ {
RETURN_SIZED_ENUMERATOR(hash, 0, 0, hash_enum_size); RETURN_SIZED_ENUMERATOR(hash, 0, 0, hash_enum_size);
rb_hash_modify_check(hash); rb_hash_modify_check(hash);
if (!RHASH_TABLE_EMPTY_P(hash))
rb_hash_foreach(hash, transform_values_i, hash); if (!RHASH_TABLE_EMPTY_P(hash)) {
rb_hash_stlike_foreach_with_replace(hash, transform_values_foreach_func, transform_values_foreach_replace, 0);
}
return hash; return hash;
} }