msgpack#100: Add a test case for pack/unpack large strings

xerial · xerial · commit 32fa5473cf27 · 2014-06-02T20:08:31.000+09:00
diff --git a/msgpack-core/src/main/java/org/msgpack/core/MessagePacker.java b/msgpack-core/src/main/java/org/msgpack/core/MessagePacker.java
@@ -334,9 +334,10 @@ public MessagePacker packString(String s) throws IOException {
                             // Allocate a larger buffer
                             int estimatedRemainingSize = Math.max(1, (int) (in.remaining() * encoder.averageBytesPerChar()));
                             encodeBuffer.flip();
-                            ByteBuffer newBuffer = ByteBuffer.allocate(encodeBuffer.remaining() + estimatedRemainingSize);
+                            ByteBuffer newBuffer = ByteBuffer.allocate(Math.max((int) (encodeBuffer.capacity() * 1.5), encodeBuffer.remaining() + estimatedRemainingSize));
                             newBuffer.put(encodeBuffer);
                             encodeBuffer = newBuffer;
+                            encoder.reset();
                             continue;
                         }
 
diff --git a/msgpack-core/src/main/java/org/msgpack/core/MessageUnpacker.java b/msgpack-core/src/main/java/org/msgpack/core/MessageUnpacker.java
@@ -827,6 +827,7 @@ public String unpackString() throws IOException {
                         if(cr.isOverflow()) {
                             // The output CharBuffer has insufficient space
                             readLen = bb.limit() - bb.remaining();
+                            decoder.reset();
                         }
 
                         if(cr.isError()) {
diff --git a/msgpack-core/src/test/scala/org/msgpack/core/MessagePackTest.scala b/msgpack-core/src/test/scala/org/msgpack/core/MessagePackTest.scala
@@ -11,6 +11,11 @@ import java.math.BigInteger
  */
 class MessagePackTest extends MessagePackSpec with PropertyChecks {
 
+  def isValidUTF8(s: String) = {
+    MessagePack.UTF8.newEncoder().canEncode(s)
+  }
+
+
   "MessagePack" should {
     "detect fixint values" in {
 
@@ -125,18 +130,22 @@ class MessagePackTest extends MessagePackSpec with PropertyChecks {
 
     "pack/unpack strings" taggedAs ("string") in {
 
-      def isValidUTF8(s: String) = {
-        MessagePack.UTF8.newEncoder().canEncode(s)
-      }
-
-
       forAll { (v: String) =>
         whenever(isValidUTF8(v)) {
           check(v, _.packString(v), _.unpackString)
         }
       }
     }
 
+    "pack/unpack large strings" taggedAs ("large-string") in {
+      // Large string
+      val strLen = Seq(1000, 2000, 10000, 50000, 100000, 500000)
+      for(l <- strLen) {
+        val v : String = Iterator.continually(Random.nextString(l * 10)).find(isValidUTF8).get
+        check(v, _.packString(v), _.unpackString)
+      }
+    }
+
     "pack/unpack binary" taggedAs ("binary") in {
       forAll { (v: Array[Byte]) =>
         check(v, { packer => packer.packBinaryHeader(v.length); packer.writePayload(v)}, { unpacker =>

Original file line number	Diff line number	Diff line change
`@@ -827,6 +827,7 @@ public String unpackString() throws IOException {`
`827`	`827`	`if(cr.isOverflow()) {`
`828`	`828`	`// The output CharBuffer has insufficient space`
`829`	`829`	`readLen = bb.limit() - bb.remaining();`
	`830`	`+ decoder.reset();`
`830`	`831`	`}`
`831`	`832`
`832`	`833`	`if(cr.isError()) {`