diff options
Diffstat (limited to 'vespajlib/src/main/java')
| -rw-r--r-- | vespajlib/src/main/java/com/yahoo/slime/BinaryView.java | 90 | ||||
| -rw-r--r-- | vespajlib/src/main/java/com/yahoo/slime/DecodeIndex.java | 60 |
2 files changed, 60 insertions, 90 deletions
diff --git a/vespajlib/src/main/java/com/yahoo/slime/BinaryView.java b/vespajlib/src/main/java/com/yahoo/slime/BinaryView.java index c54c9e7930e..0e111d42061 100644 --- a/vespajlib/src/main/java/com/yahoo/slime/BinaryView.java +++ b/vespajlib/src/main/java/com/yahoo/slime/BinaryView.java @@ -14,24 +14,15 @@ public final class BinaryView implements Inspector { private final byte[] data; private final SymbolTable names; - private final long[] index; + private final DecodeIndex index; private final int self; - private BinaryView(byte[] data, SymbolTable names, long[] index, int self) { + private BinaryView(byte[] data, SymbolTable names, DecodeIndex index, int self) { this.data = data; this.names = names; this.index = index; this.self = self; } - private int byte_offset(int idx) { - return (int)(index[idx] >> 33) & 0x7fff_ffff; - } - private int first_child(int idx) { - return (int)(index[idx] >> 2) & 0x7fff_ffff; - } - private int ext_bits(int idx) { - return (int)index[idx] & 0x3; - } private int peek_cmpr_int(int idx) { long next = data[idx++]; long value = (next & 0x7f); @@ -101,8 +92,8 @@ public final class BinaryView implements Inspector { } private Inspector find_field(int pos, int len, int sym) { for (int i = 0; i < len; ++i) { - int idx = byte_offset(pos + i); - if (peek_cmpr_int(idx - (ext_bits(pos + i) + 1)) == sym) { + int idx = index.getByteOffset(pos + i); + if (peek_cmpr_int(idx - (index.getExtBits(pos + i) + 1)) == sym) { return new BinaryView(data, names, index, pos + i); } } @@ -111,110 +102,110 @@ public final class BinaryView implements Inspector { @Override public boolean valid() { return true; } @Override public void ifValid(Consumer<Inspector> consumer) { consumer.accept(this); } - @Override public Type type() { return decode_type(data[byte_offset(self)]); } + @Override public Type type() { return decode_type(data[index.getByteOffset(self)]); } @Override public int children() { return switch (type()) { - case OBJECT, ARRAY -> extract_children(byte_offset(self)); + case OBJECT, ARRAY -> extract_children(index.getByteOffset(self)); default -> 0; }; } @Override public int entries() { return switch (type()) { - case ARRAY -> extract_children(byte_offset(self)); + case ARRAY -> extract_children(index.getByteOffset(self)); default -> 0; }; } @Override public int fields() { return switch (type()) { - case OBJECT -> extract_children(byte_offset(self)); + case OBJECT -> extract_children(index.getByteOffset(self)); default -> 0; }; } @Override public boolean asBool() { return switch (type()) { - case BOOL -> (decode_meta(data[byte_offset(self)]) != 0); + case BOOL -> (decode_meta(data[index.getByteOffset(self)]) != 0); default -> false; }; } @Override public long asLong() { return switch (type()) { - case LONG -> extract_long(byte_offset(self)); - case DOUBLE -> (long)extract_double(byte_offset(self)); + case LONG -> extract_long(index.getByteOffset(self)); + case DOUBLE -> (long)extract_double(index.getByteOffset(self)); default -> 0; }; } @Override public double asDouble() { return switch (type()) { - case LONG -> extract_long(byte_offset(self)); - case DOUBLE -> extract_double(byte_offset(self)); + case LONG -> extract_long(index.getByteOffset(self)); + case DOUBLE -> extract_double(index.getByteOffset(self)); default -> 0.0; }; } @Override public String asString() { return switch (type()) { - case STRING -> extract_string(byte_offset(self)); + case STRING -> extract_string(index.getByteOffset(self)); default -> Value.emptyString; }; } @Override public byte[] asUtf8() { return switch (type()) { - case STRING -> extract_bytes(byte_offset(self)); + case STRING -> extract_bytes(index.getByteOffset(self)); default -> Value.emptyData; }; } @Override public byte[] asData() { return switch (type()) { - case DATA -> extract_bytes(byte_offset(self)); + case DATA -> extract_bytes(index.getByteOffset(self)); default -> Value.emptyData; }; } @Override public void accept(Visitor v) { switch (type()) { case NIX: v.visitNix(); break; - case BOOL: v.visitBool(decode_meta(data[byte_offset(self)]) != 0); break; - case LONG: v.visitLong(extract_long(byte_offset(self))); break; - case DOUBLE: v.visitDouble(extract_double(byte_offset(self))); break; - case STRING: v.visitString(extract_bytes(byte_offset(self))); break; - case DATA: v.visitData(extract_bytes(byte_offset(self))); break; + case BOOL: v.visitBool(decode_meta(data[index.getByteOffset(self)]) != 0); break; + case LONG: v.visitLong(extract_long(index.getByteOffset(self))); break; + case DOUBLE: v.visitDouble(extract_double(index.getByteOffset(self))); break; + case STRING: v.visitString(extract_bytes(index.getByteOffset(self))); break; + case DATA: v.visitData(extract_bytes(index.getByteOffset(self))); break; case ARRAY: v.visitArray(this); break; case OBJECT: v.visitObject(this); break; default: throw new RuntimeException("should not be reached"); } } @Override public void traverse(ArrayTraverser at) { - int pos = first_child(self); + int pos = index.getFirstChild(self); int len = entries(); for (int i = 0; i < len; ++i) { at.entry(i, new BinaryView(data, names, index, pos + i)); } } @Override public void traverse(ObjectSymbolTraverser ot) { - int pos = first_child(self); + int pos = index.getFirstChild(self); int len = fields(); for (int i = 0; i < len; ++i) { - int sym = peek_cmpr_int(byte_offset(pos + i) - (ext_bits(pos + i) + 1)); + int sym = peek_cmpr_int(index.getByteOffset(pos + i) - (index.getExtBits(pos + i) + 1)); ot.field(sym, new BinaryView(data, names, index, pos + i)); } } @Override public void traverse(ObjectTraverser ot) { - int pos = first_child(self); + int pos = index.getFirstChild(self); int len = fields(); for (int i = 0; i < len; ++i) { - int sym = peek_cmpr_int(byte_offset(pos + i) - (ext_bits(pos + i) + 1)); + int sym = peek_cmpr_int(index.getByteOffset(pos + i) - (index.getExtBits(pos + i) + 1)); ot.field(names.inspect(sym), new BinaryView(data, names, index, pos + i)); } } @Override public Inspector entry(int idx) { int limit = entries(); if (idx >= 0 && idx < limit) { - return new BinaryView(data, names, index, first_child(self) + idx); + return new BinaryView(data, names, index, index.getFirstChild(self) + idx); } return NixValue.invalid(); } @Override public Inspector field(int sym) { int limit = fields(); if (limit > 0 && sym != SymbolTable.INVALID) { - return find_field(first_child(self), limit, sym); + return find_field(index.getFirstChild(self), limit, sym); } return NixValue.invalid(); } @@ -223,7 +214,7 @@ public final class BinaryView implements Inspector { if (limit > 0) { int sym = names.lookup(name); if (sym != SymbolTable.INVALID) { - return find_field(first_child(self), limit, sym); + return find_field(index.getFirstChild(self), limit, sym); } } return NixValue.invalid(); @@ -252,11 +243,11 @@ public final class BinaryView implements Inspector { break; } case ARRAY: { int size = input.read_size(meta); - int firstChild = index.tryReserveChildren(size, self + 1, input.getPosition()); - if (firstChild < 0) { + if (size > input.getBacking().length - index.size()) { input.fail("decode index too big"); return; } + int firstChild = index.reserve(size); index.set(self, pos, firstChild, extBits); for (int i = 0; i < size; ++i) { buildIndex(input, index, firstChild + i, 0); @@ -264,11 +255,11 @@ public final class BinaryView implements Inspector { break; } case OBJECT: { int size = input.read_size(meta); - int firstChild = index.tryReserveChildren(size, self + 1, input.getPosition()); - if (firstChild < 0) { + if (size > input.getBacking().length - index.size()) { input.fail("decode index too big"); return; } + int firstChild = index.reserve(size); index.set(self, pos, firstChild, extBits); for (int i = 0; i < size; ++i) { int childExtBits = input.skip_cmpr_int(); @@ -285,13 +276,13 @@ public final class BinaryView implements Inspector { static Inspector inspectImpl(BufferedInput input) { var names = new SymbolTable(); + var index = new DecodeIndex(); BinaryDecoder.decodeSymbolTable(input, names); - var index = new DecodeIndex(input.getBacking().length, input.getPosition()); - buildIndex(input, index, 0, 0); + buildIndex(input, index, index.reserve(1), 0); if (input.failed()) { return NixValue.invalid(); } - return new BinaryView(input.getBacking(), names, index.getBacking(), 0); + return new BinaryView(input.getBacking(), names, index, 0); } public static Inspector inspect(byte[] data) { @@ -313,13 +304,4 @@ public final class BinaryView implements Inspector { static double extract_double_for_testing(byte[] data, int idx) { return new BinaryView(data, null, null, -1).extract_double(idx); } - static int byte_offset_for_testing(DecodeIndex index, int idx) { - return new BinaryView(null, null, index.getBacking(), -1).byte_offset(idx); - } - static int first_child_for_testing(DecodeIndex index, int idx) { - return new BinaryView(null, null, index.getBacking(), -1).first_child(idx); - } - static int ext_bits_for_testing(DecodeIndex index, int idx) { - return new BinaryView(null, null, index.getBacking(), -1).ext_bits(idx); - } } diff --git a/vespajlib/src/main/java/com/yahoo/slime/DecodeIndex.java b/vespajlib/src/main/java/com/yahoo/slime/DecodeIndex.java index 5df24154a08..17c7a86730e 100644 --- a/vespajlib/src/main/java/com/yahoo/slime/DecodeIndex.java +++ b/vespajlib/src/main/java/com/yahoo/slime/DecodeIndex.java @@ -6,46 +6,23 @@ package com.yahoo.slime; * encoded in binary format. **/ final class DecodeIndex { - private long[] data; - private int reserved; - private final int totalSize; - private final int rootOffset; - - private int binarySize() { return totalSize - rootOffset; } - - private int adjustSize(int minSize, int maxSize, int cnt, int byteOffset) { - double density = (double)cnt / (double)(byteOffset - rootOffset); - double estSize = 1.1 * density * binarySize(); - double expSize = 1.25 * data.length; - double wantedSize = (estSize > expSize) ? estSize : expSize; - if (wantedSize < minSize) { - return minSize; + static final int initial_capacity = 16; + private long[] data = new long[initial_capacity]; + private int reserved = 0; + + private int adjustSize(int minSize) { + int capacity = initial_capacity; + while (capacity < minSize) { + capacity = capacity << 1; } - if (wantedSize > maxSize) { - return maxSize; - } - return (int)wantedSize; - } - - DecodeIndex(int totalSize, int rootOffset) { - this.totalSize = totalSize; - this.rootOffset = rootOffset; - int initialCapacity = Math.max(16, binarySize() / 24); - data = new long[initialCapacity]; - reserved = 1; + return capacity; } - long[] getBacking() { return data; } - - int tryReserveChildren(int n, int cnt, int byteOffset) { + int reserve(int n) { int offset = reserved; - if (n > data.length - reserved) { - final int maxSize = (totalSize - byteOffset) + cnt; - if (n > maxSize - reserved) { - return -1; // error; too much space requested - } + if (reserved + n > data.length) { long[] old = data; - data = new long[adjustSize(reserved + n, maxSize, cnt, byteOffset)]; + data = new long[adjustSize(reserved + n)]; System.arraycopy(old, 0, data, 0, reserved); } reserved += n; @@ -53,11 +30,22 @@ final class DecodeIndex { } int size() { return reserved; } - int capacity() { return data.length; } void set(int idx, int byteOffset, int firstChild, int extBits) { data[idx] = (long)(byteOffset & 0x7fff_ffff) << 33 | (long)(firstChild & 0x7fff_ffff) << 2 | extBits & 0x3; } + + int getByteOffset(int idx) { + return (int)(data[idx] >> 33) & 0x7fff_ffff; + } + + int getFirstChild(int idx) { + return (int)(data[idx] >> 2) & 0x7fff_ffff; + } + + int getExtBits(int idx) { + return (int)data[idx] & 0x3; + } } |