diff --git a/src/main/java/net/openhft/chronicle/map/VanillaChronicleMap.java b/src/main/java/net/openhft/chronicle/map/VanillaChronicleMap.java index 46e511bea..abae5bd93 100644 --- a/src/main/java/net/openhft/chronicle/map/VanillaChronicleMap.java +++ b/src/main/java/net/openhft/chronicle/map/VanillaChronicleMap.java @@ -90,8 +90,6 @@ class VanillaChronicleMap, final boolean putReturnsNull; final boolean removeReturnsNull; - final boolean useSmallMultiMaps; - private final long lockTimeOutNS; private final ChronicleHashErrorListener errorListener; transient Segment[] segments; // non-final for close() @@ -142,7 +140,6 @@ class VanillaChronicleMap, this.eventListener = builder.eventListener(); hashSplitting = HashSplitting.Splitting.forSegments(actualSegments); - useSmallMultiMaps = useSmallMultiMaps(); initTransients(); } @@ -240,19 +237,19 @@ class VanillaChronicleMap, } long sizeOfMultiMap() { - return useSmallMultiMaps ? + return useSmallMultiMaps() ? VanillaShortShortMultiMap.sizeInBytes(entriesPerSegment) : VanillaIntIntMultiMap.sizeInBytes(entriesPerSegment); } long sizeOfMultiMapBitSet() { - return useSmallMultiMaps ? + return useSmallMultiMaps() ? VanillaShortShortMultiMap.sizeOfBitSetInBytes(entriesPerSegment) : VanillaIntIntMultiMap.sizeOfBitSetInBytes(entriesPerSegment); } boolean useSmallMultiMaps() { - return entriesPerSegment * 2L <= VanillaShortShortMultiMap.MAX_CAPACITY; + return entriesPerSegment <= VanillaShortShortMultiMap.MAX_CAPACITY; } long sizeOfBitSets() { @@ -591,7 +588,7 @@ class VanillaChronicleMap, new NativeBytes(new VanillaBytesMarshallerFactory(), start, start + sizeOfMultiMapBitSet(), null); multiMapBytes.load(); - return useSmallMultiMaps ? + return useSmallMultiMaps() ? new VanillaShortShortMultiMap(multiMapBytes, sizeOfMultiMapBitSetBytes) : new VanillaIntIntMultiMap(multiMapBytes, sizeOfMultiMapBitSetBytes); }