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

Stabilty release based on YCSB.

Browse Source
This commit is contained in:
Peter Lawrey
2014-10-27 19:43:35 +00:00
parent a956ac2a0e
commit 4eeea5bc62
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/net/openhft/chronicle/map/VanillaChronicleMap.java
+7 -6
View File
@@ -22,7 +22,6 @@ import net.openhft.chronicle.common.ChronicleHashErrorListener;
import net.openhft.chronicle.common.serialization.*; import net.openhft.chronicle.common.serialization.*;
import net.openhft.chronicle.common.threadlocal.Provider; import net.openhft.chronicle.common.threadlocal.Provider;
import net.openhft.chronicle.common.threadlocal.ThreadLocalCopies; import net.openhft.chronicle.common.threadlocal.ThreadLocalCopies;
import net.openhft.lang.Maths;
import net.openhft.lang.collection.DirectBitSet; import net.openhft.lang.collection.DirectBitSet;
import net.openhft.lang.collection.SingleThreadedDirectBitSet; import net.openhft.lang.collection.SingleThreadedDirectBitSet;
import net.openhft.lang.io.*; import net.openhft.lang.io.*;
@@ -90,6 +89,8 @@ class VanillaChronicleMap<K, KI, MKI extends MetaBytesInterop<K, KI>,
final boolean putReturnsNull; final boolean putReturnsNull;
final boolean removeReturnsNull; final boolean removeReturnsNull;
final boolean useSmallMultiMaps;
private final long lockTimeOutNS; private final long lockTimeOutNS;
private final ChronicleHashErrorListener errorListener; private final ChronicleHashErrorListener errorListener;
transient Segment[] segments; // non-final for close() transient Segment[] segments; // non-final for close()
@@ -139,7 +140,7 @@ class VanillaChronicleMap<K, KI, MKI extends MetaBytesInterop<K, KI>,
this.eventListener = builder.eventListener(); this.eventListener = builder.eventListener();
hashSplitting = HashSplitting.Splitting.forSegments(actualSegments); hashSplitting = HashSplitting.Splitting.forSegments(actualSegments);
useSmallMultiMaps = useSmallMultiMaps();
initTransients(); initTransients();
} }
@@ -237,19 +238,19 @@ class VanillaChronicleMap<K, KI, MKI extends MetaBytesInterop<K, KI>,
} }
long sizeOfMultiMap() { long sizeOfMultiMap() {
return useSmallMultiMaps() ? return useSmallMultiMaps ?
VanillaShortShortMultiMap.sizeInBytes(entriesPerSegment) : VanillaShortShortMultiMap.sizeInBytes(entriesPerSegment) :
VanillaIntIntMultiMap.sizeInBytes(entriesPerSegment); VanillaIntIntMultiMap.sizeInBytes(entriesPerSegment);
} }
long sizeOfMultiMapBitSet() { long sizeOfMultiMapBitSet() {
return useSmallMultiMaps() ? return useSmallMultiMaps ?
VanillaShortShortMultiMap.sizeOfBitSetInBytes(entriesPerSegment) : VanillaShortShortMultiMap.sizeOfBitSetInBytes(entriesPerSegment) :
VanillaIntIntMultiMap.sizeOfBitSetInBytes(entriesPerSegment); VanillaIntIntMultiMap.sizeOfBitSetInBytes(entriesPerSegment);
} }
boolean useSmallMultiMaps() { boolean useSmallMultiMaps() {
return entriesPerSegment <= VanillaShortShortMultiMap.MAX_CAPACITY; return entriesPerSegment * 2L <= VanillaShortShortMultiMap.MAX_CAPACITY;
} }
long sizeOfBitSets() { long sizeOfBitSets() {
@@ -588,7 +589,7 @@ class VanillaChronicleMap<K, KI, MKI extends MetaBytesInterop<K, KI>,
new NativeBytes(new VanillaBytesMarshallerFactory(), start, new NativeBytes(new VanillaBytesMarshallerFactory(), start,
start + sizeOfMultiMapBitSet(), null); start + sizeOfMultiMapBitSet(), null);
multiMapBytes.load(); multiMapBytes.load();
return useSmallMultiMaps() ? return useSmallMultiMaps ?
new VanillaShortShortMultiMap(multiMapBytes, sizeOfMultiMapBitSetBytes) : new VanillaShortShortMultiMap(multiMapBytes, sizeOfMultiMapBitSetBytes) :
new VanillaIntIntMultiMap(multiMapBytes, sizeOfMultiMapBitSetBytes); new VanillaIntIntMultiMap(multiMapBytes, sizeOfMultiMapBitSetBytes);
} }