Merge pull request msgpack#436 from miniway/develop

xerial · web-flow · commit 0d8b7b7552a5 · 2017-10-20T18:43:35.000-07:00
Improve readPayload performance
diff --git a/msgpack-core/src/main/java/org/msgpack/core/MessageUnpacker.java b/msgpack-core/src/main/java/org/msgpack/core/MessageUnpacker.java
@@ -1516,6 +1516,37 @@ public void readPayload(ByteBuffer dst)
         }
     }
 
+    /**
+     * Reads payload bytes of binary, extension, or raw string types.
+     *
+     * <p>
+     * This consumes bytes, copies them to the specified buffer
+     * This is usually faster than readPayload(ByteBuffer) by using unsafe.copyMemory
+     *
+     * @param dst the Message buffer into which the data is read
+     * @param off the offset in the Message buffer
+     * @param len the number of bytes to read
+     * @throws IOException when underlying input throws IOException
+     */
+    public void readPayload(MessageBuffer dst, int off, int len)
+            throws IOException
+    {
+        while (true) {
+            int bufferRemaining = buffer.size() - position;
+            if (bufferRemaining >= len) {
+                dst.putMessageBuffer(off, buffer, position, len);
+                position += len;
+                return;
+            }
+            dst.putMessageBuffer(off, buffer, position, bufferRemaining);
+            off += bufferRemaining;
+            len -= bufferRemaining;
+            position += bufferRemaining;
+
+            nextBuffer();
+        }
+    }
+
     /**
      * Reads payload bytes of binary, extension, or raw string types.
      *
@@ -1566,8 +1597,7 @@ public byte[] readPayload(int length)
     public void readPayload(byte[] dst, int off, int len)
             throws IOException
     {
-        // TODO optimize
-        readPayload(ByteBuffer.wrap(dst, off, len));
+        readPayload(MessageBuffer.wrap(dst), off, len);
     }
 
     /**
@@ -1591,7 +1621,7 @@ public MessageBuffer readPayloadAsReference(int length)
             return slice;
         }
         MessageBuffer dst = MessageBuffer.allocate(length);
-        readPayload(dst.sliceAsByteBuffer());
+        readPayload(dst, 0, length);
         return dst;
     }
 
diff --git a/msgpack-core/src/main/java/org/msgpack/core/buffer/MessageBufferU.java b/msgpack-core/src/main/java/org/msgpack/core/buffer/MessageBufferU.java
@@ -248,7 +248,7 @@ public void copyTo(int index, MessageBuffer dst, int offset, int length)
     @Override
     public void putMessageBuffer(int index, MessageBuffer src, int srcOffset, int len)
     {
-        putBytes(index, src.toByteArray(), srcOffset, len);
+        putByteBuffer(index, src.sliceAsByteBuffer(srcOffset, len), len);
     }
 
     @Override
diff --git a/msgpack-core/src/test/scala/org/msgpack/core/MessageUnpackerTest.scala b/msgpack-core/src/test/scala/org/msgpack/core/MessageUnpackerTest.scala
@@ -406,7 +406,7 @@ class MessageUnpackerTest extends MessagePackSpec {
       }
     }
 
-    "be faster then msgpack-v6 skip" taggedAs ("cmp-skip") in {
+    "be faster than msgpack-v6 skip" taggedAs ("cmp-skip") in {
 
       trait Fixture {
         val unpacker: MessageUnpacker

Original file line number	Diff line number	Diff line change
`@@ -248,7 +248,7 @@ public void copyTo(int index, MessageBuffer dst, int offset, int length)`
`248`	`248`	`@Override`
`249`	`249`	`public void putMessageBuffer(int index, MessageBuffer src, int srcOffset, int len)`
`250`	`250`	`{`
`251`		`- putBytes(index, src.toByteArray(), srcOffset, len);`
	`251`	`+ putByteBuffer(index, src.sliceAsByteBuffer(srcOffset, len), len);`
`252`	`252`	`}`
`253`	`253`
`254`	`254`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -406,7 +406,7 @@ class MessageUnpackerTest extends MessagePackSpec {`
`406`	`406`	`}`
`407`	`407`	`}`
`408`	`408`
`409`		`- "be faster then msgpack-v6 skip" taggedAs ("cmp-skip") in {`
	`409`	`+ "be faster than msgpack-v6 skip" taggedAs ("cmp-skip") in {`
`410`	`410`
`411`	`411`	`trait Fixture {`
`412`	`412`	`val unpacker: MessageUnpacker`