Skip to content

Follow-up of #387 #388

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
Sep 23, 2016
Merged

Follow-up of #387 #388

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9467f61
resetDecoder should be called once per decoding
miniway Sep 23, 2016
4c3d460
Fix code style and test cases
xerial Sep 23, 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
Prev Previous commit
Fix code style and test cases
  • Loading branch information
@xerial
xerial committed Sep 23, 2016
commit 4c3d46084115b0649cca4735fe595c0710ea2c17
2 changes: 1 addition & 1 deletion msgpack-core/src/main/java/org/msgpack/core/buffer/SequenceMessageBufferInput.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ private void nextInput() throws IOException
if (sequence.hasMoreElements()) {
input = sequence.nextElement();
if (input == null) {
throw new NullPointerException();
throw new NullPointerException("An element in the MessageBufferInput sequence is null");
}
}
else {
Expand Down
48 changes: 35 additions & 13 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 @@ -207,21 +207,21 @@ class MessageUnpackerTest extends MessagePackSpec {
builder.result()
}

def sequenceUnpackers(data: Array[Byte], size: Int) : Seq[MessageUnpacker] = {
def unpackerCollectionWithVariousBuffers(data: Array[Byte], chunkSize: Int) : Seq[MessageUnpacker] = {
val seqBytes = Seq.newBuilder[MessageBufferInput]
val seqByteBuffers = Seq.newBuilder[MessageBufferInput]
val seqDirectBuffers = Seq.newBuilder[MessageBufferInput]
var left = data.length
var position = 0
while (left > 0) {
val length = Math.min(size, left)
seqBytes += new ArrayBufferInput(data, position, length);
val length = Math.min(chunkSize, left)
seqBytes += new ArrayBufferInput(data, position, length)
val bb = ByteBuffer.allocate(length)
val db = ByteBuffer.allocateDirect(length)
bb.put(data, position, length).flip()
db.put(data, position, length).flip()
seqByteBuffers += new ByteBufferInput(bb);
seqDirectBuffers += new ByteBufferInput(db);
seqByteBuffers += new ByteBufferInput(bb)
seqDirectBuffers += new ByteBufferInput(db)
left -= length
position += length
}
Expand Down Expand Up @@ -360,25 +360,47 @@ class MessageUnpackerTest extends MessagePackSpec {
new SplitTest {val data = testData3(30)}.run
}

"read data at buffer boundary" taggedAs("boundary2") in {
"read integer at MessageBuffer boundaries" taggedAs("integer-buffer-boundary") in {
val packer = MessagePack.newDefaultBufferPacker()
(0 until 1170).foreach{i =>
packer.packLong(0x0011223344556677L)
packer.packString("hello world")
}
packer.close
val data = packer.toByteArray

var unpacker = MessagePack.newDefaultUnpacker(new InputStreamBufferInput(new ByteArrayInputStream(data), 8192))
(0 until 1170).foreach { i =>
unpacker.unpackLong() shouldBe 0x0011223344556677L
unpacker.unpackString() shouldBe "hello world"
// Boundary test
withResource(MessagePack.newDefaultUnpacker(new InputStreamBufferInput(new ByteArrayInputStream(data), 8192))) { unpacker =>
(0 until 1170).foreach { i =>
unpacker.unpackLong() shouldBe 0x0011223344556677L
}
}
unpacker.close()

for (unpacker <- sequenceUnpackers(data, 32)) {
// Boundary test for sequences of ByteBuffer, DirectByteBuffer backed MessageInput.
for (unpacker <- unpackerCollectionWithVariousBuffers(data, 32)) {
(0 until 1170).foreach { i =>
unpacker.unpackLong() shouldBe 0x0011223344556677L
}
}
}

"read string at MessageBuffer boundaries" taggedAs("string-buffer-boundary") in {
val packer = MessagePack.newDefaultBufferPacker()
(0 until 1170).foreach{i =>
packer.packString("hello world")
}
packer.close
val data = packer.toByteArray

// Boundary test
withResource(MessagePack.newDefaultUnpacker(new InputStreamBufferInput(new ByteArrayInputStream(data), 8192))) { unpacker =>
(0 until 1170).foreach { i =>
unpacker.unpackString() shouldBe "hello world"
}
}

// Boundary test for sequences of ByteBuffer, DirectByteBuffer backed MessageInput.
for (unpacker <- unpackerCollectionWithVariousBuffers(data, 32)) {
(0 until 1170).foreach { i =>
unpacker.unpackString() shouldBe "hello world"
}
}
Expand Down