Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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
}
}
}