diff options
author | Brendan Ribera <brendan.ribera@gmail.com> | 2016-08-30 16:22:49 -0700 |
---|---|---|
committer | Brendan Ribera <brendan.ribera@gmail.com> | 2016-08-30 16:22:49 -0700 |
commit | de028631fce33b77811f2a29c83c36ab875c751c (patch) | |
tree | bb7af17442b49144cf202e377d8c4b99ad263a23 | |
parent | 047419a1729b3b0cb57dc7f78b93d18fb430b6c4 (diff) | |
download | protobuf-de028631fce33b77811f2a29c83c36ab875c751c.tar.gz protobuf-de028631fce33b77811f2a29c83c36ab875c751c.tar.bz2 protobuf-de028631fce33b77811f2a29c83c36ab875c751c.zip |
fix #2036: use `rb_hash_*` to accumulate hashes
Instead of shifting/xoring the hash at each field, use the built-in ruby
apis for generating a hash from multiple input values.
Now returns a Fixnum.
-rw-r--r-- | ruby/ext/google/protobuf_c/repeated_field.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/ruby/ext/google/protobuf_c/repeated_field.c b/ruby/ext/google/protobuf_c/repeated_field.c index 47c207a5..1c651c19 100644 --- a/ruby/ext/google/protobuf_c/repeated_field.c +++ b/ruby/ext/google/protobuf_c/repeated_field.c @@ -447,9 +447,8 @@ VALUE RepeatedField_eq(VALUE _self, VALUE _other) { */ VALUE RepeatedField_hash(VALUE _self) { RepeatedField* self = ruby_to_RepeatedField(_self); - - VALUE hash = LL2NUM(0); - + st_index_t h = rb_hash_start(0); + VALUE hash_sym = rb_intern("hash"); upb_fieldtype_t field_type = self->field_type; VALUE field_type_class = self->field_type_class; size_t elem_size = native_slot_size(field_type); @@ -457,12 +456,11 @@ VALUE RepeatedField_hash(VALUE _self) { for (int i = 0; i < self->size; i++, off += elem_size) { void* mem = ((uint8_t *)self->elements) + off; VALUE elem = native_slot_get(field_type, field_type_class, mem); - hash = rb_funcall(hash, rb_intern("<<"), 1, INT2NUM(2)); - hash = rb_funcall(hash, rb_intern("^"), 1, - rb_funcall(elem, rb_intern("hash"), 0)); + h = rb_hash_uint(h, NUM2LONG(rb_funcall(elem, hash_sym, 0))); } + h = rb_hash_end(h); - return hash; + return INT2FIX(h); } /* |