github-migration
/
mongo-ruby-driver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #54 from renctan/master 

RUBY-296 fix for BSON timestamp serialization issue for C extension
This commit is contained in:
Kyle Banker 2011-08-24 15:24:06 -07:00
parent 1090dd3873 19c9cb778b
commit a3b28f7bde
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ext/cbson/cbson.c
View File

@ -436,9 +436,9 @@ static int write_element(VALUE key, VALUE value, VALUE extra, int allow_id) {
} }
if (strcmp(cls, "BSON::Timestamp") == 0) { if (strcmp(cls, "BSON::Timestamp") == 0) {
write_name_and_type(buffer, key, 0x11); write_name_and_type(buffer, key, 0x11);
int seconds = FIX2INT( unsigned int seconds = NUM2UINT(
rb_funcall(value, rb_intern("seconds"), 0)); rb_funcall(value, rb_intern("seconds"), 0));
int increment = FIX2INT( unsigned int increment = NUM2UINT(
rb_funcall(value, rb_intern("increment"), 0)); rb_funcall(value, rb_intern("increment"), 0));
SAFE_WRITE(buffer, (const char*)&increment, 4); SAFE_WRITE(buffer, (const char*)&increment, 4);
@ -830,12 +830,12 @@ static VALUE get_value(const char* buffer, int* position, int type) {
} }
case 17: case 17:
{ {
int sec, inc; unsigned int sec, inc;
VALUE argv[2]; VALUE argv[2];
memcpy(&inc, buffer + *position, 4); memcpy(&inc, buffer + *position, 4);
memcpy(&sec, buffer + *position + 4, 4); memcpy(&sec, buffer + *position + 4, 4);
argv[0] = INT2FIX(sec); argv[0] = UINT2NUM(sec);
argv[1] = INT2FIX(inc); argv[1] = UINT2NUM(inc);
value = rb_class_new_instance(2, argv, Timestamp); value = rb_class_new_instance(2, argv, Timestamp);
*position += 8; *position += 8;
break; break;

10
test/bson/timestamp_test.rb
View File

@ -19,6 +19,16 @@ class TimestampTest < Test::Unit::TestCase
end end
end end
def test_timestamp_32bit_compatibility
max_32bit_fixnum = (1 << 30) - 1
test_val = max_32bit_fixnum + 10
ts = Timestamp.new(test_val, test_val)
doc = {:ts => ts}
bson = BSON::BSON_CODER.serialize(doc)
assert_equal doc[:ts], BSON::BSON_CODER.deserialize(bson)['ts']
end
def test_implements_array_for_backward_compatibility def test_implements_array_for_backward_compatibility
silently do silently do
ts = Timestamp.new(5000, 200) ts = Timestamp.new(5000, 200)