Make key/value size discovery more defensive, inspired by #43

This commit is contained in:
leventov
2015-09-21 19:08:45 +03:00
parent 97ae2fc2a2
commit d9c771bedc
11 changed files with 37 additions and 23 deletions
@@ -1329,7 +1329,7 @@ public final class ChronicleMapBuilder<K, V> implements
MetaProvider metaWriterProvider = valueBuilder.metaInteropProvider();
copies = metaWriterProvider.getCopies(copies);
MetaBytesWriter metaValueWriter = metaWriterProvider.get(copies,
valueBuilder.metaInterop(), valueWriter, defaultValue);
valueBuilder.metaInterop(), valueWriter, defaultValue, true);
return new ConstantValueProvider<>(defaultValue, metaValueWriter, valueWriter);
}
@@ -55,7 +55,8 @@ final class WriterWithSize<T> {
copies = writerProvider.getCopies(copies);
Object writer = writerProvider.get(copies, originalWriter);
copies = metaWriterProvider.getCopies(copies);
MetaBytesWriter metaWriter = metaWriterProvider.get(copies, originalMetaWriter, writer, t);
MetaBytesWriter metaWriter = metaWriterProvider.get(
copies, originalMetaWriter, writer, t, false);
long size = metaWriter.size(writer, t);
if (bufferResizer != null)
out = resizeIfRequired(out, size);
@@ -90,7 +91,8 @@ final class WriterWithSize<T> {
public ThreadLocalCopies writeInLoop(Bytes out, T t, Object writer,
@Nullable ThreadLocalCopies copies) {
copies = metaWriterProvider.getCopies(copies);
MetaBytesWriter metaWriter = metaWriterProvider.get(copies, originalMetaWriter, writer, t);
MetaBytesWriter metaWriter = metaWriterProvider.get(
copies, originalMetaWriter, writer, t, false);
long size = metaWriter.size(writer, t);
if (bufferResizer != null)
out = resizeIfRequired(out, size);
@@ -35,6 +35,6 @@ public class ValueBytesInterop<V, VI, MVI extends MetaBytesInterop<V, ? super VI
public MVI valueMetaInterop(V value) {
return mh.m().metaValueInteropProvider.get(
ch.copies, mh.m().originalMetaValueInterop, valueInterop, value);
ch.copies, mh.m().originalMetaValueInterop, valueInterop, value, false);
}
}