Merge pull request #129 from msgpack/add_unpacker_buffer_reset_benchmark

xerial · xerial · commit 359ef126337c · 2014-08-11T10:27:22.000+09:00
Add a benchmark of MessageBufferInput#reset
diff --git a/msgpack-core/src/main/java/org/msgpack/core/buffer/ArrayBufferInput.java b/msgpack-core/src/main/java/org/msgpack/core/buffer/ArrayBufferInput.java
@@ -20,14 +20,17 @@ public ArrayBufferInput(byte[] arr, int offset, int length) {
         this.buffer = MessageBuffer.wrap(checkNotNull(arr, "input array is null")).slice(offset, length);
     }
 
-    public void reset(byte[] arr) {
-        this.buffer = MessageBuffer.wrap(checkNotNull(arr, "input array is null"));
+    public void reset(MessageBuffer buf) {
+        this.buffer = buf;
         this.isRead = false;
     }
 
+    public void reset(byte[] arr) {
+        reset(MessageBuffer.wrap(checkNotNull(arr, "input array is null")));
+    }
+
     public void reset(byte[] arr, int offset, int len) {
-        this.buffer = MessageBuffer.wrap(checkNotNull(arr, "input array is null")).slice(offset, len);
-        this.isRead = false;
+        reset(MessageBuffer.wrap(checkNotNull(arr, "input array is null")).slice(offset, 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
@@ -4,6 +4,7 @@ import java.io.{EOFException, ByteArrayInputStream, ByteArrayOutputStream}
 import scala.util.Random
 import org.msgpack.core.buffer.{MessageBuffer, MessageBufferInput, OutputStreamBufferOutput, ArrayBufferInput}
 import org.msgpack.value.ValueType
+import xerial.core.io.IOUtil
 
 /**
  * Created on 2014/05/07.
@@ -529,6 +530,43 @@ class MessageUnpackerTest extends MessagePackSpec {
 
     }
 
-  }
+    // TODO: change tag 'ignore' to 'in'
+    "improve the performance via reset method" taggedAs("reset-arr") in {
+
+      val out = new ByteArrayOutputStream
+      val packer = MessagePackFactory.newDefaultPacker(out)
+      packer.packInt(0)
+      packer.flush
+      val arr = out.toByteArray
+      val mb = MessageBuffer.wrap(arr)
+
+      val N = 1000
+      val t = time("unpacker", repeat = 10) {
+        block("no-buffer-reset") {
+          IOUtil.withResource(MessagePackFactory.newDefaultUnpacker(arr)) { unpacker =>
+            for (i <- 0 until N) {
+              val buf = new ArrayBufferInput(arr)
+              unpacker.reset(buf)
+              unpacker.unpackInt
+              unpacker.close
+            }
+          }
+        }
 
+        block("buffer-reset") {
+          IOUtil.withResource(MessagePackFactory.newDefaultUnpacker(arr)) { unpacker =>
+            val buf = new ArrayBufferInput(arr)
+            for (i <- 0 until N) {
+              buf.reset(mb)
+              unpacker.reset(buf)
+              unpacker.unpackInt
+              unpacker.close
+            }
+          }
+        }
+      }
+
+      t("buffer-reset").averageWithoutMinMax should be <= t("no-buffer-reset").averageWithoutMinMax
+    }
+  }
 }

Original file line number	Diff line number	Diff line change
`@@ -20,14 +20,17 @@ public ArrayBufferInput(byte[] arr, int offset, int length) {`
`20`	`20`	`this.buffer = MessageBuffer.wrap(checkNotNull(arr, "input array is null")).slice(offset, length);`
`21`	`21`	`}`
`22`	`22`
`23`		`- public void reset(byte[] arr) {`
`24`		`- this.buffer = MessageBuffer.wrap(checkNotNull(arr, "input array is null"));`
	`23`	`+ public void reset(MessageBuffer buf) {`
	`24`	`+ this.buffer = buf;`
`25`	`25`	`this.isRead = false;`
`26`	`26`	`}`
`27`	`27`
	`28`	`+ public void reset(byte[] arr) {`
	`29`	`+ reset(MessageBuffer.wrap(checkNotNull(arr, "input array is null")));`
	`30`	`+ }`
	`31`	`+`
`28`	`32`	`public void reset(byte[] arr, int offset, int len) {`
`29`		`- this.buffer = MessageBuffer.wrap(checkNotNull(arr, "input array is null")).slice(offset, len);`
`30`		`- this.isRead = false;`
	`33`	`+ reset(MessageBuffer.wrap(checkNotNull(arr, "input array is null")).slice(offset, len));`
`31`	`34`	`}`
`32`	`35`
`33`	`36`	`@Override`