Skip to content

Refactor MessageBuffer instantiation and add more tests #380

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xerial merged 2 commits into from
Aug 9, 2016
Merged

Refactor MessageBuffer instantiation and add more tests #380

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5c77085
Refactor creating MessageBuffer instance
miniway Aug 4, 2016
4ce46a3
Add more tests for ByteBuffer
miniway Aug 9, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 15 additions & 25 deletions msgpack-core/src/main/java/org/msgpack/core/buffer/MessageBuffer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ public static MessageBuffer allocate(int size)
}

/**
* Wraps a ByteBuffer into a MessageBuffer.
* Wraps a byte array into a MessageBuffer.
*
* The new MessageBuffer will be backed by the given byte array. Modifications to the new MessageBuffer will cause the byte array to be modified and vice versa.
*
Expand All @@ -214,7 +214,7 @@ public static MessageBuffer wrap(byte[] array)
}

/**
* Wraps a ByteBuffer into a MessageBuffer.
* Wraps a byte array into a MessageBuffer.
*
* The new MessageBuffer will be backed by the given byte array. Modifications to the new MessageBuffer will cause the byte array to be modified and vice versa.
*
Expand Down Expand Up @@ -264,28 +264,7 @@ public static MessageBuffer wrap(ByteBuffer bb)
private static MessageBuffer newMessageBuffer(byte[] arr, int off, int len)
{
checkNotNull(arr);
try {
return (MessageBuffer) mbArrConstructor.newInstance(arr, off, len);
}
catch (InstantiationException e) {
// should never happen
throw new IllegalStateException(e);
}
catch (IllegalAccessException e) {
// should never happen unless security manager restricts this reflection
throw new IllegalStateException(e);
}
catch (InvocationTargetException e) {
if (e.getCause() instanceof RuntimeException) {
// underlaying constructor may throw RuntimeException
throw (RuntimeException) e.getCause();
}
else if (e.getCause() instanceof Error) {
throw (Error) e.getCause();
}
// should never happen
throw new IllegalStateException(e.getCause());
}
return newInstance(mbArrConstructor, arr, off, len);
}

/**
Expand All @@ -297,10 +276,21 @@ else if (e.getCause() instanceof Error) {
private static MessageBuffer newMessageBuffer(ByteBuffer bb)
{
checkNotNull(bb);
return newInstance(mbBBConstructor, bb);
}

/**
* Creates a new MessageBuffer instance
*
* @param constructor A MessageBuffer constructor
* @return new MessageBuffer instance
*/
private static MessageBuffer newInstance(Constructor<?> constructor, Object... args)
{
try {
// We need to use reflection to create MessageBuffer instances in order to prevent TypeProfile generation for getInt method. TypeProfile will be
// generated to resolve one of the method references when two or more classes overrides the method.
return (MessageBuffer) mbBBConstructor.newInstance(bb);
return (MessageBuffer) constructor.newInstance(args);
}
catch (InstantiationException e) {
// should never happen
Expand Down
189 changes: 145 additions & 44 deletions msgpack-core/src/test/scala/org/msgpack/core/MessageUnpackerTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,6 +345,22 @@ class MessageUnpackerTest extends MessagePackSpec {

"be faster then msgpack-v6 skip" taggedAs ("cmp-skip") in {

trait Fixture {
val unpacker: MessageUnpacker
def run {
var count = 0
try {
while (unpacker.hasNext) {
unpacker.skipValue()
count += 1
}
}
finally {
unpacker.close()
}
}
}

val data = testData3(10000)
val N = 100

Expand All @@ -367,21 +383,29 @@ class MessageUnpackerTest extends MessagePackSpec {
unpacker.close()
}

block("v7") {
val unpacker = Random.shuffle(unpackers(data)).head
var count = 0
try {
while (unpacker.hasNext) {
unpacker.skipValue()
count += 1
}
}
finally
unpacker.close()
block("v7-array") {
new Fixture { override val unpacker = MessagePack.newDefaultUnpacker(data) }.run
}

block("v7-array-buffer") {
new Fixture {
val bb = ByteBuffer.allocate(data.length)
bb.put(data).flip()
override val unpacker = MessagePack.newDefaultUnpacker(bb)
}.run
}
block("v7-direct-buffer") {
new Fixture {
val db = ByteBuffer.allocateDirect(data.length)
db.put(data).flip()
override val unpacker = MessagePack.newDefaultUnpacker(db)
}.run
}
}

t("v7").averageWithoutMinMax should be <= t("v6").averageWithoutMinMax
t("v7-array").averageWithoutMinMax should be <= t("v6").averageWithoutMinMax
t("v7-array-buffer").averageWithoutMinMax should be <= t("v6").averageWithoutMinMax
t("v7-direct-buffer").averageWithoutMinMax should be <= t("v6").averageWithoutMinMax
}

import org.msgpack.`type`.{ValueType => ValueTypeV6}
Expand Down Expand Up @@ -448,6 +472,20 @@ class MessageUnpackerTest extends MessagePackSpec {
unpacker.skipValue()
}
}
trait Fixture {
val unpacker : MessageUnpacker
def run {
var count = 0
try {
while (unpacker.hasNext) {
readValue(unpacker)
count += 1
}
}
finally
unpacker.close()
}
}

val data = testData3(10000)
val N = 100
Expand All @@ -469,22 +507,29 @@ class MessageUnpackerTest extends MessagePackSpec {
unpacker.close()
}

block("v7") {
val unpacker = Random.shuffle(unpackers(data)).head
var count = 0
try {
while (unpacker.hasNext) {
readValue(unpacker)
count += 1
}
}
finally
unpacker.close()
block("v7-array") {
new Fixture { override val unpacker = MessagePack.newDefaultUnpacker(data) }.run
}
}

t("v7").averageWithoutMinMax should be <= t("v6").averageWithoutMinMax
block("v7-array-buffer") {
new Fixture {
val bb = ByteBuffer.allocate(data.length)
bb.put(data).flip()
override val unpacker = MessagePack.newDefaultUnpacker(bb)
}.run
}
block("v7-direct-buffer") {
new Fixture {
val db = ByteBuffer.allocateDirect(data.length)
db.put(data).flip()
override val unpacker = MessagePack.newDefaultUnpacker(db)
}.run
}
}

t("v7-array").averageWithoutMinMax should be <= t("v6").averageWithoutMinMax
t("v7-array-buffer").averageWithoutMinMax should be <= t("v6").averageWithoutMinMax
t("v7-direct-buffer").averageWithoutMinMax should be <= t("v6").averageWithoutMinMax

}

Expand All @@ -500,6 +545,35 @@ class MessageUnpackerTest extends MessagePackSpec {
}
packer.close()

trait Fixture {
val unpacker : MessageUnpacker
val loop : Int
def run {
var i = 0
try {
while (i < loop) {
val len = unpacker.unpackBinaryHeader()
val out = new Array[Byte](len)
unpacker.readPayload(out, 0, len)
i += 1
}
}
finally
unpacker.close()
}
def runRef {
var i = 0
try {
while (i < loop) {
val len = unpacker.unpackBinaryHeader()
val out = unpacker.readPayloadAsReference(len)
i += 1
}
}
finally
unpacker.close()
}
}
val b = bos.toByteArray
time("unpackBinary", repeat = 100) {
block("v6") {
Expand All @@ -513,27 +587,54 @@ class MessageUnpackerTest extends MessagePackSpec {
unpacker.close()
}

block("v7") {
val unpacker = Random.shuffle(unpackers(b)).head
var i = 0
while (i < R) {
val len = unpacker.unpackBinaryHeader()
val out = new Array[Byte](len)
unpacker.readPayload(out, 0, len)
i += 1
}
unpacker.close()
block("v7-array") {
new Fixture {
override val unpacker = MessagePack.newDefaultUnpacker(b)
override val loop = R
}.run
}

block("v7-ref") {
val unpacker = Random.shuffle(unpackers(b)).head
var i = 0
while (i < R) {
val len = unpacker.unpackBinaryHeader()
val out = unpacker.readPayloadAsReference(len)
i += 1
}
unpacker.close()
block("v7-array-buffer") {
new Fixture {
val bb = ByteBuffer.allocate(b.length)
bb.put(b).flip()
override val unpacker = MessagePack.newDefaultUnpacker(bb)
override val loop = R
}.run
}

block("v7-direct-buffer") {
new Fixture {
val db = ByteBuffer.allocateDirect(b.length)
db.put(b).flip()
override val unpacker = MessagePack.newDefaultUnpacker(db)
override val loop = R
}.run
}

block("v7-ref-array") {
new Fixture {
override val unpacker = MessagePack.newDefaultUnpacker(b)
override val loop = R
}.run
}

block("v7-ref-array-buffer") {
new Fixture {
val bb = ByteBuffer.allocate(b.length)
bb.put(b).flip()
override val unpacker = MessagePack.newDefaultUnpacker(bb)
override val loop = R
}.run
}

block("v7-ref-direct-buffer") {
new Fixture {
val db = ByteBuffer.allocateDirect(b.length)
db.put(b).flip()
override val unpacker = MessagePack.newDefaultUnpacker(db)
override val loop = R
}.run
}
}
}
Expand Down