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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Rob Austin
2014-11-26 13:39:18 +00:00
parent 8f80aaa1b8 d1f083d6e7
commit f3161e31bb
6 changed files with 40 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/net/openhft/chronicle/hash/serialization/internal/CopyingMetaBytesInterop.java
+5 -5
View File
@@ -20,14 +20,14 @@ package net.openhft.chronicle.hash.serialization.internal;
import net.openhft.chronicle.hash.serialization.BytesWriter;
import net.openhft.chronicle.hash.serialization.Hasher;
import net.openhft.lang.threadlocal.Provider;
import net.openhft.lang.threadlocal.StatefulCopyable;
import net.openhft.lang.threadlocal.ThreadLocalCopies;
import net.openhft.lang.io.Bytes;
import net.openhft.lang.io.DirectBytes;
import net.openhft.lang.io.DirectStore;
import net.openhft.lang.io.serialization.BytesMarshaller;
import net.openhft.lang.io.serialization.JDKObjectSerializer;
import net.openhft.lang.io.serialization.JDKZObjectSerializer;
import net.openhft.lang.threadlocal.Provider;
import net.openhft.lang.threadlocal.StatefulCopyable;
import net.openhft.lang.threadlocal.ThreadLocalCopies;
import java.io.IOException;
import java.io.ObjectInputStream;
@@ -206,7 +206,7 @@ public abstract class CopyingMetaBytesInterop<E, W> implements MetaBytesInterop<
return buffer = store.bytes();
}
} else {
buffer = new DirectStore(JDKObjectSerializer.INSTANCE, maxSize, false).bytes();
buffer = new DirectStore(JDKZObjectSerializer.INSTANCE, maxSize, false).bytes();
return buffer;
}
}
src/main/java/net/openhft/chronicle/map/AbstractChronicleMapBuilder.java
+6 -7
View File
@@ -605,10 +605,9 @@ abstract class AbstractChronicleMapBuilder<K, V,
return self();
}
ObjectSerializer objectSerializer() {
ObjectSerializer acquireObjectSerializer(ObjectSerializer defaultSerializer) {
return objectSerializer == null ?
objectSerializer = BytesMarshallableSerializer.create(
bytesMarshallerFactory(), JDKObjectSerializer.INSTANCE) :
BytesMarshallableSerializer.create(bytesMarshallerFactory(), defaultSerializer) :
objectSerializer;
}
@@ -861,7 +860,7 @@ abstract class AbstractChronicleMapBuilder<K, V,
VanillaChronicleMap<K, ?, ?, V, ?, ?> map =
new ReplicatedChronicleMap<K, Object, MetaBytesInterop<K, Object>,
V, Object, MetaBytesWriter<V, Object>>(this, identifier);
BytesStore bytesStore = new DirectStore(JDKObjectSerializer.INSTANCE,
BytesStore bytesStore = new DirectStore(JDKZObjectSerializer.INSTANCE,
map.sizeInBytes(), true);
map.createMappedStoreAndSegments(bytesStore);
return map;
@@ -872,7 +871,7 @@ abstract class AbstractChronicleMapBuilder<K, V,
pushingToMapEventListener();
try {
VanillaChronicleMap<K, ?, ?, V, ?, ?> map = newMap(singleHashReplication, channel);
BytesStore bytesStore = new DirectStore(JDKObjectSerializer.INSTANCE,
BytesStore bytesStore = new DirectStore(JDKZObjectSerializer.INSTANCE,
map.sizeInBytes(), true);
map.createMappedStoreAndSegments(bytesStore);
return establishReplication(map, singleHashReplication, channel);
@@ -933,8 +932,8 @@ abstract class AbstractChronicleMapBuilder<K, V,
}
void preMapConstruction(boolean replicated) {
keyBuilder.objectSerializer(objectSerializer());
valueBuilder.objectSerializer(objectSerializer());
keyBuilder.objectSerializer(acquireObjectSerializer(JDKObjectSerializer.INSTANCE));
valueBuilder.objectSerializer(acquireObjectSerializer(JDKZObjectSerializer.INSTANCE));
long maxSize = (long) entrySize(replicated) * figureBufferAllocationFactor();
keyBuilder.maxSize(maxSize);
src/main/java/net/openhft/chronicle/map/VanillaChronicleMap.java
+2 -2
View File
@@ -28,7 +28,7 @@ import net.openhft.chronicle.hash.serialization.internal.MetaProvider;
import net.openhft.lang.collection.DirectBitSet;
import net.openhft.lang.collection.SingleThreadedDirectBitSet;
import net.openhft.lang.io.*;
import net.openhft.lang.io.serialization.JDKObjectSerializer;
import net.openhft.lang.io.serialization.JDKZObjectSerializer;
import net.openhft.lang.io.serialization.impl.VanillaBytesMarshallerFactory;
import net.openhft.lang.model.constraints.Nullable;
import net.openhft.lang.threadlocal.Provider;
@@ -208,7 +208,7 @@ class VanillaChronicleMap<K, KI, MKI extends MetaBytesInterop<K, KI>,
long createMappedStoreAndSegments(File file) throws IOException {
return createMappedStoreAndSegments(new MappedStore(file, FileChannel.MapMode.READ_WRITE,
sizeInBytes(), JDKObjectSerializer.INSTANCE));
sizeInBytes(), JDKZObjectSerializer.INSTANCE));
}
private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {