Skip to content

Commit

Permalink
fix #2036: use rb_hash_* to accumulate hashes
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
abscondment committed Aug 30, 2016
1 parent 047419a commit de02863
Showing 1 changed file with 5 additions and 7 deletions.
12 changes: 5 additions & 7 deletions ruby/ext/google/protobuf_c/repeated_field.c
Original file line number Diff line number Diff line change
Expand Up @@ -447,22 +447,20 @@ 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);
size_t off = 0;
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);
}

/*
Expand Down

0 comments on commit de02863

Please sign in to comment.