Skip to content

Commit 884661d

Browse files
frsyukifrsyuki
authored
Merge pull request #383 from miniway/directbuf
Fix test failures at universal MessageBuffer
2 parents 75a4b0e + f09f595 commit 884661d

File tree

4 files changed

+45
-44
lines changed

4 files changed

+45
-44
lines changed

‎msgpack-core/src/main/java/org/msgpack/core/buffer/MessageBuffer.java‎

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -246,13 +246,7 @@ public static MessageBuffer wrap(byte[] array, int offset, int length)
246246
*/
247247
public static MessageBuffer wrap(ByteBuffer bb)
248248
{
249-
MessageBuffer b = newMessageBuffer(bb);
250-
if (bb.position() > 0 || bb.limit() != bb.capacity()) {
251-
return b.slice(bb.position(), bb.remaining());
252-
}
253-
else {
254-
return b;
255-
}
249+
return newMessageBuffer(bb);
256250
}
257251

258252
/**
@@ -355,14 +349,14 @@ else if (DirectBufferAccess.isDirectByteBufferInstance(buffer.reference)) {
355349
}
356350
// Direct buffer or off-heap memory
357351
this.base = null;
358-
this.address = DirectBufferAccess.getAddress(bb);
359-
this.size = bb.capacity();
352+
this.address = DirectBufferAccess.getAddress(bb) + bb.position();
353+
this.size = bb.remaining();
360354
this.reference = bb;
361355
}
362356
else if (bb.hasArray()) {
363357
this.base = bb.array();
364-
this.address = ARRAY_BYTE_BASE_OFFSET;
365-
this.size = bb.array().length;
358+
this.address = ARRAY_BYTE_BASE_OFFSET + bb.arrayOffset() + bb.position();
359+
this.size = bb.remaining();
366360
this.reference = null;
367361
}
368362
else {

‎msgpack-core/src/main/java/org/msgpack/core/buffer/MessageBufferU.java‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,7 @@ public class MessageBufferU
3131
MessageBufferU(byte[] arr, int offset, int length)
3232
{
3333
super(arr, offset, length);
34-
ByteBuffer bb = ByteBuffer.wrap(arr);
35-
bb.position(offset);
36-
bb.limit(offset + length);
37-
this.wrap = bb.slice();
34+
this.wrap = ByteBuffer.wrap(arr, offset, length).slice();
3835
}
3936

4037
MessageBufferU(ByteBuffer bb)
@@ -248,6 +245,12 @@ public void copyTo(int index, MessageBuffer dst, int offset, int length)
248245
}
249246
}
250247

248+
@Override
249+
public void putMessageBuffer(int index, MessageBuffer src, int srcOffset, int len)
250+
{
251+
putBytes(index, src.toByteArray(), srcOffset, len);
252+
}
253+
251254
@Override
252255
public byte[] toByteArray()
253256
{

‎msgpack-core/src/test/scala/org/msgpack/core/MessageUnpackerTest.scala‎

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ import MessageUnpackerTest._
4646

4747
class MessageUnpackerTest extends MessagePackSpec {
4848

49+
val universal = MessageBuffer.allocate(0).isInstanceOf[MessageBufferU]
4950
def testData: Array[Byte] = {
5051
val out = new ByteArrayOutputStream()
5152
val packer = MessagePack.newDefaultPacker(out)
@@ -194,11 +195,14 @@ class MessageUnpackerTest extends MessagePackSpec {
194195
val db = ByteBuffer.allocateDirect(data.length)
195196
bb.put(data).flip()
196197
db.put(data).flip()
197-
Seq(
198-
MessagePack.newDefaultUnpacker(data),
199-
MessagePack.newDefaultUnpacker(bb),
200-
MessagePack.newDefaultUnpacker(db)
201-
)
198+
val builder = Seq.newBuilder[MessageUnpacker]
199+
builder += MessagePack.newDefaultUnpacker(data)
200+
builder += MessagePack.newDefaultUnpacker(bb)
201+
if (!universal) {
202+
builder += MessagePack.newDefaultUnpacker(db)
203+
}
204+
205+
builder.result()
202206
}
203207

204208
"MessageUnpacker" should {
@@ -394,7 +398,7 @@ class MessageUnpackerTest extends MessagePackSpec {
394398
override val unpacker = MessagePack.newDefaultUnpacker(bb)
395399
}.run
396400
}
397-
block("v7-direct-buffer") {
401+
if (!universal) block("v7-direct-buffer") {
398402
new Fixture {
399403
val db = ByteBuffer.allocateDirect(data.length)
400404
db.put(data).flip()
@@ -405,7 +409,7 @@ class MessageUnpackerTest extends MessagePackSpec {
405409

406410
t("v7-array").averageWithoutMinMax should be <= t("v6").averageWithoutMinMax
407411
t("v7-array-buffer").averageWithoutMinMax should be <= t("v6").averageWithoutMinMax
408-
t("v7-direct-buffer").averageWithoutMinMax should be <= t("v6").averageWithoutMinMax
412+
if (!universal) t("v7-direct-buffer").averageWithoutMinMax should be <= t("v6").averageWithoutMinMax
409413
}
410414

411415
import org.msgpack.`type`.{ValueType => ValueTypeV6}
@@ -518,7 +522,8 @@ class MessageUnpackerTest extends MessagePackSpec {
518522
override val unpacker = MessagePack.newDefaultUnpacker(bb)
519523
}.run
520524
}
521-
block("v7-direct-buffer") {
525+
526+
if (!universal) block("v7-direct-buffer") {
522527
new Fixture {
523528
val db = ByteBuffer.allocateDirect(data.length)
524529
db.put(data).flip()
@@ -529,7 +534,7 @@ class MessageUnpackerTest extends MessagePackSpec {
529534

530535
t("v7-array").averageWithoutMinMax should be <= t("v6").averageWithoutMinMax
531536
t("v7-array-buffer").averageWithoutMinMax should be <= t("v6").averageWithoutMinMax
532-
t("v7-direct-buffer").averageWithoutMinMax should be <= t("v6").averageWithoutMinMax
537+
if (!universal) t("v7-direct-buffer").averageWithoutMinMax should be <= t("v6").averageWithoutMinMax
533538

534539
}
535540

@@ -603,7 +608,7 @@ class MessageUnpackerTest extends MessagePackSpec {
603608
}.run
604609
}
605610

606-
block("v7-direct-buffer") {
611+
if (!universal) block("v7-direct-buffer") {
607612
new Fixture {
608613
val db = ByteBuffer.allocateDirect(b.length)
609614
db.put(b).flip()
@@ -628,7 +633,7 @@ class MessageUnpackerTest extends MessagePackSpec {
628633
}.run
629634
}
630635

631-
block("v7-ref-direct-buffer") {
636+
if (!universal) block("v7-ref-direct-buffer") {
632637
new Fixture {
633638
val db = ByteBuffer.allocateDirect(b.length)
634639
db.put(b).flip()

‎msgpack-core/src/test/scala/org/msgpack/core/buffer/MessageBufferTest.scala‎

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ class MessageBufferTest
2929

3030
"MessageBuffer" should {
3131

32+
val universal = MessageBuffer.allocate(0).isInstanceOf[MessageBufferU]
3233
"check buffer type" in {
3334
val b = MessageBuffer.allocate(0)
3435
info(s"MessageBuffer type: ${b.getClass.getName}")
@@ -55,7 +56,7 @@ class MessageBufferTest
5556
val M = 64 * 1024 * 1024
5657

5758
val ub = MessageBuffer.allocate(M)
58-
val ud = MessageBuffer.wrap(ByteBuffer.allocateDirect(M))
59+
val ud = if (universal) MessageBuffer.wrap(ByteBuffer.allocate(M)) else MessageBuffer.wrap(ByteBuffer.allocateDirect(M))
5960
val hb = ByteBuffer.allocate(M)
6061
val db = ByteBuffer.allocateDirect(M)
6162

@@ -150,13 +151,14 @@ class MessageBufferTest
150151
}
151152
}
152153
}
154+
val builder = Seq.newBuilder[MessageBuffer]
155+
builder += MessageBuffer.allocate(10)
156+
builder += MessageBuffer.wrap(ByteBuffer.allocate(10))
157+
if (!universal) builder += MessageBuffer.wrap(ByteBuffer.allocateDirect(10))
158+
val buffers = builder.result()
153159

154160
"convert to ByteBuffer" in {
155-
for (t <- Seq(
156-
MessageBuffer.allocate(10),
157-
MessageBuffer.wrap(ByteBuffer.allocate(10)),
158-
MessageBuffer.wrap(ByteBuffer.allocateDirect(10)))
159-
) {
161+
for (t <- buffers) {
160162
val bb = t.sliceAsByteBuffer
161163
bb.position shouldBe 0
162164
bb.limit shouldBe 10
@@ -165,11 +167,7 @@ class MessageBufferTest
165167
}
166168

167169
"put ByteBuffer on itself" in {
168-
for (t <- Seq(
169-
MessageBuffer.allocate(10),
170-
MessageBuffer.wrap(ByteBuffer.allocate(10)),
171-
MessageBuffer.wrap(ByteBuffer.allocateDirect(10)))
172-
) {
170+
for (t <- buffers) {
173171
val b = Array[Byte](0x02, 0x03)
174172
val srcArray = ByteBuffer.wrap(b)
175173
val srcHeap = ByteBuffer.allocate(b.length)
@@ -193,19 +191,18 @@ class MessageBufferTest
193191
}
194192

195193
"put MessageBuffer on itself" in {
196-
for (t <- Seq(
197-
MessageBuffer.allocate(10),
198-
MessageBuffer.wrap(ByteBuffer.allocate(10)),
199-
MessageBuffer.wrap(ByteBuffer.allocateDirect(10)))
200-
) {
194+
for (t <- buffers) {
201195
val b = Array[Byte](0x02, 0x03)
202196
val srcArray = ByteBuffer.wrap(b)
203197
val srcHeap = ByteBuffer.allocate(b.length)
204198
srcHeap.put(b).flip
205199
val srcOffHeap = ByteBuffer.allocateDirect(b.length)
206200
srcOffHeap.put(b).flip
201+
val builder = Seq.newBuilder[ByteBuffer]
202+
builder ++= Seq(srcArray, srcHeap)
203+
if (!universal) builder += srcOffHeap
207204

208-
for (src <- Seq(MessageBuffer.wrap(srcArray), MessageBuffer.wrap(srcHeap), MessageBuffer.wrap(srcOffHeap))) {
205+
for (src <- builder.result().map(d => MessageBuffer.wrap(d))) {
209206
// Write header bytes
210207
val header = Array[Byte](0x00, 0x01)
211208
t.putBytes(0, header, 0, header.length)
@@ -256,7 +253,9 @@ class MessageBufferTest
256253

257254
checkSliceAndCopyTo(MessageBuffer.wrap(prepareBytes), MessageBuffer.wrap(prepareBytes))
258255
checkSliceAndCopyTo(MessageBuffer.wrap(ByteBuffer.wrap(prepareBytes)), MessageBuffer.wrap(ByteBuffer.wrap(prepareBytes)))
259-
checkSliceAndCopyTo(MessageBuffer.wrap(prepareDirectBuffer), MessageBuffer.wrap(prepareDirectBuffer))
256+
if (!universal) {
257+
checkSliceAndCopyTo(MessageBuffer.wrap(prepareDirectBuffer), MessageBuffer.wrap(prepareDirectBuffer))
258+
}
260259
}
261260
}
262261
}

0 commit comments

Comments
 (0)