msgpack 1.2.9-x86-mingw32 → 1.2.10-x86-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ef3281aaf81e18a84e4f8ac15c0b53c4b3f9a6113127f8d628797685f14df6a
-  data.tar.gz: 5eca0921a4ee1d0e25822e251ad0c907070b3f8b46a2ac0249ea0ae8e475ee50
+  metadata.gz: f8cb471c0c7a58bfda3608da6aac6b10db89ce54c188cd61f944c0b7e5bf68b0
+  data.tar.gz: 301972667c743256f61fa73ebac2353a62147cead2e72e86cb268d3d7ca080d1
 SHA512:
-  metadata.gz: 8d345c8d9895190f4baac0b7db59841cbd14b373777f686c335d5254438181a4a13ae0d6d0cab4306f283fbcafe53a883a8cef31982d991aaceada618496f8ee
-  data.tar.gz: 85496bb825f0f71b694460079a05e75e082876ab82659ccc73d8e41d767e11700ac5cb87405ba59733ba165ee22b071c887dcfa93ff743bbfe85844489282570
+  metadata.gz: c2e9db0dcfc48978e0247becf6eae2a2f680a58bd081f2a3a9cff0d224aa0552d3aa2e2b068df5c1add3c9562a8bc0fc8220c0247ebc678f4e8c733252812389
+  data.tar.gz: 50d9dad7b559f7114c06928a2b7ad48de4a73ec86efe9ad6298e32e8100351412f54d1a50c41da7463fb10642193860edeba6f6213d5b636f25820c912457d3a

data/.travis.yml

@@ -23,9 +23,9 @@ matrix:
       os: linux
     - rvm: 2.5.3
       os: linux
-    - rvm: 2.6.0
+    - rvm: 2.6.1
       os: linux
-    - rvm: 2.6.0
+    - rvm: 2.6.1
       os: osx
     - rvm: ruby-head
       os: linux
@@ -36,6 +36,8 @@ matrix:
     - rvm: jruby-19mode
       os: linux
   allow_failures:
+    - rvm: 2.6.1
+      os: osx
     - rvm: ruby-head
     - rvm: jruby-head
     - rvm: jruby-19mode

data/ChangeLog

@@ -1,3 +1,7 @@
+2019-04-19 version 1.2.10:
+
+* Optimze MessagePack.unpack not to copy source string
+
 2019-03-13 version 1.2.9:
 
 * Hotfix release only for JRuby: 1.2.8-java was built incorrectly

data/ext/java/org/msgpack/jruby/Unpacker.java

@@ -170,7 +170,7 @@ public class Unpacker extends RubyObject {
     return data == null ? ctx.getRuntime().getFalse() : ctx.getRuntime().getTrue();
   }
 
-  @JRubyMethod(required = 1)
+  @JRubyMethod(required = 1, name = "feed", alias = { "feed_reference" })
   public IRubyObject feed(ThreadContext ctx, IRubyObject data) {
     ByteList byteList = data.asString().getByteList();
     if (decoder == null) {

data/ext/msgpack/buffer.h

@@ -262,6 +262,20 @@ static inline size_t msgpack_buffer_append_string(msgpack_buffer_t* b, VALUE str
     return length;
 }
 
+static inline size_t msgpack_buffer_append_string_reference(msgpack_buffer_t* b, VALUE string)
+{
+    size_t length = RSTRING_LEN(string);
+
+    if(length > MSGPACK_BUFFER_STRING_WRITE_REFERENCE_MINIMUM) {
+        _msgpack_buffer_append_long_string(b, string);
+
+    } else {
+        msgpack_buffer_append(b, RSTRING_PTR(string), length);
+    }
+
+    return length;
+}
+
 
 /*
  * IO functions

data/ext/msgpack/unpacker_class.c

@@ -256,6 +256,17 @@ static VALUE Unpacker_feed(VALUE self, VALUE data)
     return self;
 }
 
+static VALUE Unpacker_feed_reference(VALUE self, VALUE data)
+{
+    UNPACKER(self, uk);
+
+    StringValue(data);
+
+    msgpack_buffer_append_string_reference(UNPACKER_BUFFER_(uk), data);
+
+    return self;
+}
+
 static VALUE Unpacker_each_impl(VALUE self)
 {
     UNPACKER(self, uk);
@@ -312,8 +323,7 @@ static VALUE Unpacker_feed_each(VALUE self, VALUE data)
     }
 #endif
 
-    // TODO optimize
-    Unpacker_feed(self, data);
+    Unpacker_feed_reference(self, data);
     return Unpacker_each(self);
 }
 
@@ -386,9 +396,6 @@ static VALUE Unpacker_full_unpack(VALUE self)
 {
     UNPACKER(self, uk);
 
-    /* prefer reference than copying; see MessagePack_Unpacker_module_init */
-    msgpack_buffer_set_write_reference_threshold(UNPACKER_BUFFER_(uk), 0);
-
     int r = msgpack_unpacker_read(uk, 0);
     if(r < 0) {
         raise_unpacker_error(r);
@@ -444,6 +451,7 @@ void MessagePack_Unpacker_module_init(VALUE mMessagePack)
     rb_define_method(cMessagePack_Unpacker, "read_map_header", Unpacker_read_map_header, 0);
     //rb_define_method(cMessagePack_Unpacker, "peek_next_type", Unpacker_peek_next_type, 0);  // TODO
     rb_define_method(cMessagePack_Unpacker, "feed", Unpacker_feed, 1);
+    rb_define_method(cMessagePack_Unpacker, "feed_reference", Unpacker_feed_reference, 1);
     rb_define_method(cMessagePack_Unpacker, "each", Unpacker_each, 0);
     rb_define_method(cMessagePack_Unpacker, "feed_each", Unpacker_feed_each, 1);
     rb_define_method(cMessagePack_Unpacker, "reset", Unpacker_reset, 0);

data/lib/msgpack.rb

@@ -27,7 +27,7 @@ module MessagePack
 
     if src.is_a? String
       unpacker = DefaultFactory.unpacker param || DEFAULT_EMPTY_PARAMS
-      unpacker.feed src
+      unpacker.feed_reference src
     else
       unpacker = DefaultFactory.unpacker src, param || DEFAULT_EMPTY_PARAMS
     end

data/lib/msgpack/version.rb

@@ -1,5 +1,5 @@
 module MessagePack
-  VERSION = "1.2.9"
+  VERSION = "1.2.10"
 
   # NOTE for msgpack-ruby maintainer:
   # Check these things to release new binaryes for new Ruby versions (especially for Windows):

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: msgpack
 version: !ruby/object:Gem::Version
-  version: 1.2.9
+  version: 1.2.10
 platform: x86-mingw32
 authors:
 - Sadayuki Furuhashi
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-13 00:00:00.000000000 Z
+date: 2019-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -246,7 +246,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: msgpack
-rubygems_version: 2.7.8
+rubygems_version: 2.7.9
 signing_key: 
 specification_version: 4
 summary: MessagePack, a binary-based efficient data interchange format.