Skip to content

Optimizations for String decoding #16

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
merged 2 commits into from
Dec 14, 2015
Merged

Optimizations for String decoding #16

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ad3a88d
avoid buffer slicing in decodeString
phraktle Dec 13, 2015
61e98ed
decodeString: reuse CharsetDecoder
phraktle Dec 13, 2015
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
16 changes: 12 additions & 4 deletions src/main/java/com/maxmind/db/Decoder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@
import java.io.IOException;
import java.math.BigInteger;
import java.nio.ByteBuffer;
import java.nio.charset.CharacterCodingException;
import java.nio.charset.Charset;
import java.nio.charset.CharsetDecoder;

import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
Expand All @@ -15,13 +17,17 @@
* This class CANNOT be shared between threads
*/
final class Decoder {
private static final Charset UTF_8 = Charset.forName("UTF-8");

// XXX - This is only for unit testings. We should possibly make a
// constructor to set this
boolean POINTER_TEST_HACK = false;
private final long pointerBase;

private final ObjectMapper objectMapper;

private final CharsetDecoder utfDecoder = UTF_8.newDecoder();

private final ByteBuffer buffer;

static enum Type {
Expand Down Expand Up @@ -182,10 +188,12 @@ private Result decodePointer(int ctrlByte, int offset) {
return new Result(new LongNode(pointer), offset + pointerSize);
}

private String decodeString(int size) {
ByteBuffer buffer = this.buffer.slice();
buffer.limit(size);
return Charset.forName("UTF-8").decode(buffer).toString();
private String decodeString(int size) throws CharacterCodingException {
int oldLimit = buffer.limit();
buffer.limit(buffer.position() + size);
String s = utfDecoder.decode(buffer).toString();
buffer.limit(oldLimit);
return s;
}

private IntNode decodeUint16(int size) {
Expand Down