Alawn/Chronicle-Map
1
0
Fork 0
mirror of https://github.com/OpenHFT/Chronicle-Map.git synced 2021-09-13 01:26:12 +00:00
Code Releases Activity

Reduced max reasonable serialized size

Browse Source
This commit is contained in:
leventov
2015-02-06 00:35:00 +07:00
parent 9f05bcd528
commit 2d778a5042
3 changed files with 9 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/net/openhft/chronicle/hash/serialization/internal/CopyingMetaBytesInterop.java
+1 -1
View File
@@ -28,7 +28,7 @@ import java.io.Serializable;
public abstract class CopyingMetaBytesInterop<E, W> extends BasicCopyingMetaBytesInterop<E, W> {
private static final long serialVersionUID = 1L;
private static final long MAX_REASONABLE_SERIALIZED_SIZE = MemoryUnit.MEGABYTES.toBytes(512L);
private static final long MAX_REASONABLE_SERIALIZED_SIZE = MemoryUnit.MEGABYTES.toBytes(16L);
public static void checkMaxSizeStillReasonable(long maxSize, Exception ex) {
if (maxSize > MAX_REASONABLE_SERIALIZED_SIZE) {
src/main/java/net/openhft/chronicle/hash/serialization/internal/DataValueMetaBytesInterop.java
+1 -1
View File
@@ -41,7 +41,7 @@ public abstract class DataValueMetaBytesInterop<E>
}
void init(BytesWriter<E> writer, E e, long size) {
Bytes buffer = this.buffer.obtain(size, false);
Bytes buffer = this.buffer.obtain(size, true);
writer.write(buffer, e);
buffer.flip();
assert buffer.remaining() == size;
src/main/java/net/openhft/chronicle/hash/serialization/internal/DirectBytesBuffer.java
+7 -22
View File
@@ -17,7 +17,6 @@
package net.openhft.chronicle.hash.serialization.internal;
import net.openhft.chronicle.hash.serialization.BytesWriter;
import net.openhft.lang.io.BoundsCheckingNativeBytes;
import net.openhft.lang.io.Bytes;
import net.openhft.lang.io.DirectBytes;
import net.openhft.lang.io.DirectStore;
@@ -34,7 +33,6 @@ class DirectBytesBuffer
private static final long serialVersionUID = 0L;
private final Serializable identity;
transient DirectBytes buffer;
transient BoundsCheckingNativeBytes checkingBuffer;
transient ForBytesMarshaller forBytesMarshaller;
transient ForBytesWriter forBytesWriter;
@@ -60,29 +58,16 @@ class DirectBytesBuffer
DirectBytes buf;
if ((buf = buffer) != null) {
if (maxSize <= buf.capacity()) {
if (!boundsChecking)
return buf.clear();
Bytes checkingBuf;
if ((checkingBuf = checkingBuffer) != null) {
return checkingBuf.clear();
} else {
return (checkingBuffer = new BoundsCheckingNativeBytes(buf)).clear();
}
return buf.clear();
} else {
DirectStore store = (DirectStore) buf.store();
store.resize(maxSize, true);
buf = buffer = store.bytes();
if (!boundsChecking)
return buf;
return (checkingBuffer = new BoundsCheckingNativeBytes(buf));
store.resize(maxSize, false);
return buffer = store.bytes();
}
} else {
buf = buffer = new DirectStore(JDKObjectSerializer.INSTANCE,
// don't allocate 0 bytes
Math.max(1, maxSize), true).bytes();
if (!boundsChecking)
return buf;
return (checkingBuffer = new BoundsCheckingNativeBytes(buf));
buffer = new DirectStore(JDKObjectSerializer.INSTANCE, Math.max(1, maxSize), true)
.bytes();
return buffer;
}
}
@@ -140,7 +125,7 @@ class DirectBytesBuffer
this.writer = writer;
cur = e;
long size = writer.size(e);
Bytes buffer = this.buffer.obtain(size, false);
Bytes buffer = this.buffer.obtain(size, true);
writer.write(buffer, e);
buffer.flip();
this.size = size;