Skip to content

Add utility methods to pack/unpack to/from byte arrays efficiently #310

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 24 commits into from
Jan 4, 2016
Merged

Add utility methods to pack/unpack to/from byte arrays efficiently #310

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
b5d62da
Merge pull request #312 from msgpack/v08-buffer-api-fix-msgformat
xerial Jan 4, 2016
e261c59
Merge v07-develop and fix code style
xerial Jan 4, 2016
8cb71d9
Move Nullable to annocation package
xerial Jan 4, 2016
0215af9
Fix typo
xerial Jan 4, 2016
7102ecb
Remove unnecessary public declaration from the interface
xerial Jan 4, 2016
7b7012f
Extract common code
xerial Jan 4, 2016
5cbd2e0
Use the root constructor
xerial Jan 4, 2016
b391406
remove default factory setter
xerial Jan 4, 2016
d9dfb06
Replace MessagePackFactory with mutable Packer/UnpackerConfig-based code
xerial Jan 4, 2016
645abde
Revert MessagePackFormatFactory -> MessagePackFactory
xerial Jan 4, 2016
2cb2fcc
Fix typo
xerial Jan 4, 2016
23b1882
Use static import
xerial Jan 4, 2016
1fab3f7
Remove comment
xerial Jan 4, 2016
d29276f
Revert the removed configuration comments and use more redable config…
xerial Jan 4, 2016
f7d57e3
Relocate Code class inside MessagePack again since it is used for Pac…
xerial Jan 4, 2016
031ead3
Rename to PackStringWithGetBytes and add comments
xerial Jan 4, 2016
4230539
Rename castBuffer to numberBuffer to clarify the usage of this buffer
xerial Jan 4, 2016
3d328e9
Add assertion
xerial Jan 4, 2016
66ce882
Remove unused variable
xerial Jan 4, 2016
72ceb0c
Fix comment
xerial Jan 4, 2016
10c241b
Use a config param for 8192
xerial Jan 4, 2016
9a966a5
Small optimization
xerial Jan 4, 2016
0d78ca7
Remove unused code
xerial Jan 4, 2016
31e1efa
Rename variable
xerial Jan 4, 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
33 changes: 17 additions & 16 deletions msgpack-core/src/main/java/org/msgpack/core/MessageBufferPacker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,31 +15,27 @@
//
package org.msgpack.core;

import org.msgpack.core.buffer.ArrayBufferOutput;
import org.msgpack.core.buffer.MessageBuffer;
import org.msgpack.core.buffer.MessageBufferOutput;
import org.msgpack.core.buffer.ArrayBufferOutput;

import java.io.IOException;
import java.util.List;

/**
* MessagePacker that is useful to produce byte array output
*/
public class MessageBufferPacker
extends MessagePacker
{
public MessageBufferPacker()
{
this(new ArrayBufferOutput());
}

public MessageBufferPacker(ArrayBufferOutput out)
public MessageBufferPacker(MessagePack.PackerConfig config)
{
super(out);
this(new ArrayBufferOutput(), config);
}

@Override
public MessageBufferPacker setSmallStringOptimizationThreshold(int bytes)
public MessageBufferPacker(ArrayBufferOutput out, MessagePack.PackerConfig config)
{
super.setSmallStringOptimizationThreshold(bytes);
return this;
super(out, config);
}

public MessageBufferOutput reset(MessageBufferOutput out)
Expand All @@ -51,23 +47,28 @@ public MessageBufferOutput reset(MessageBufferOutput out)
return super.reset(out);
}

private ArrayBufferOutput getArrayBufferOut()
{
return (ArrayBufferOutput) out;
}

public void clear()
{
((ArrayBufferOutput) out).clear();
getArrayBufferOut().clear();
}

public byte[] toByteArray()
{
return ((ArrayBufferOutput) out).toByteArray();
return getArrayBufferOut().toByteArray();
}

public MessageBuffer toMessageBuffer()
{
return ((ArrayBufferOutput) out).toMessageBuffer();
return getArrayBufferOut().toMessageBuffer();
}

public List<MessageBuffer> toBufferList()
{
return ((ArrayBufferOutput) out).toBufferList();
return getArrayBufferOut().toBufferList();
}
}
89 changes: 1 addition & 88 deletions msgpack-core/src/main/java/org/msgpack/core/MessageFormat.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

import org.msgpack.core.annotations.VisibleForTesting;
import org.msgpack.value.ValueType;
import org.msgpack.core.MessagePack.Code;

/**
* Describes the list of the message format types defined in the MessagePack specification.
Expand Down Expand Up @@ -65,94 +66,6 @@ public enum MessageFormat
MAP32(ValueType.MAP),
NEGFIXINT(ValueType.INTEGER);

/**
* The prefix code set of MessagePack. See also https://github.com/msgpack/msgpack/blob/master/spec.md for details.
*/
public static final class Code
{
public static final boolean isFixInt(byte b)
{
int v = b & 0xFF;
return v <= 0x7f || v >= 0xe0;
}

public static final boolean isPosFixInt(byte b)
{
return (b & POSFIXINT_MASK) == 0;
}

public static final boolean isNegFixInt(byte b)
{
return (b & NEGFIXINT_PREFIX) == NEGFIXINT_PREFIX;
}

public static final boolean isFixStr(byte b)
{
return (b & (byte) 0xe0) == Code.FIXSTR_PREFIX;
}

public static final boolean isFixedArray(byte b)
{
return (b & (byte) 0xf0) == Code.FIXARRAY_PREFIX;
}

public static final boolean isFixedMap(byte b)
{
return (b & (byte) 0xf0) == Code.FIXMAP_PREFIX;
}

public static final boolean isFixedRaw(byte b)
{
return (b & (byte) 0xe0) == Code.FIXSTR_PREFIX;
}

public static final byte POSFIXINT_MASK = (byte) 0x80;

public static final byte FIXMAP_PREFIX = (byte) 0x80;
public static final byte FIXARRAY_PREFIX = (byte) 0x90;
public static final byte FIXSTR_PREFIX = (byte) 0xa0;

public static final byte NIL = (byte) 0xc0;
public static final byte NEVER_USED = (byte) 0xc1;
public static final byte FALSE = (byte) 0xc2;
public static final byte TRUE = (byte) 0xc3;
public static final byte BIN8 = (byte) 0xc4;
public static final byte BIN16 = (byte) 0xc5;
public static final byte BIN32 = (byte) 0xc6;
public static final byte EXT8 = (byte) 0xc7;
public static final byte EXT16 = (byte) 0xc8;
public static final byte EXT32 = (byte) 0xc9;
public static final byte FLOAT32 = (byte) 0xca;
public static final byte FLOAT64 = (byte) 0xcb;
public static final byte UINT8 = (byte) 0xcc;
public static final byte UINT16 = (byte) 0xcd;
public static final byte UINT32 = (byte) 0xce;
public static final byte UINT64 = (byte) 0xcf;

public static final byte INT8 = (byte) 0xd0;
public static final byte INT16 = (byte) 0xd1;
public static final byte INT32 = (byte) 0xd2;
public static final byte INT64 = (byte) 0xd3;

public static final byte FIXEXT1 = (byte) 0xd4;
public static final byte FIXEXT2 = (byte) 0xd5;
public static final byte FIXEXT4 = (byte) 0xd6;
public static final byte FIXEXT8 = (byte) 0xd7;
public static final byte FIXEXT16 = (byte) 0xd8;

public static final byte STR8 = (byte) 0xd9;
public static final byte STR16 = (byte) 0xda;
public static final byte STR32 = (byte) 0xdb;

public static final byte ARRAY16 = (byte) 0xdc;
public static final byte ARRAY32 = (byte) 0xdd;

public static final byte MAP16 = (byte) 0xde;
public static final byte MAP32 = (byte) 0xdf;

public static final byte NEGFIXINT_PREFIX = (byte) 0xe0;
}

private static final MessageFormat[] formatTable = new MessageFormat[256];
private final ValueType valueType;

Expand Down
Loading