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

Reverted 4eeea5b

Browse Source
This commit is contained in:
leventov
2014-10-28 01:33:42 +03:00
parent cc6bcc0cc2
commit d9f7e2c7cb
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/net/openhft/chronicle/map/VanillaChronicleMap.java
+4 -7
View File
@@ -90,8 +90,6 @@ class VanillaChronicleMap<K, KI, MKI extends MetaBytesInterop<K, KI>,
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<K, KI, MKI extends MetaBytesInterop<K, KI>,
this.eventListener = builder.eventListener();
hashSplitting = HashSplitting.Splitting.forSegments(actualSegments);
useSmallMultiMaps = useSmallMultiMaps();
initTransients();
}
@@ -240,19 +237,19 @@ class VanillaChronicleMap<K, KI, MKI extends MetaBytesInterop<K, KI>,
}
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<K, KI, MKI extends MetaBytesInterop<K, KI>,
new NativeBytes(new VanillaBytesMarshallerFactory(), start,
start + sizeOfMultiMapBitSet(), null);
multiMapBytes.load();
return useSmallMultiMaps ?
return useSmallMultiMaps() ?
new VanillaShortShortMultiMap(multiMapBytes, sizeOfMultiMapBitSetBytes) :
new VanillaIntIntMultiMap(multiMapBytes, sizeOfMultiMapBitSetBytes);
}