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

Remove entriesPerSegment field from VanillaChronicleHash

Browse Source
This commit is contained in:
leventov
2016-01-19 14:17:38 +03:00
parent 6aa389b824
commit bb22985d9c
2 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/net/openhft/chronicle/hash/impl/VanillaChronicleHash.java
+1 -9
View File
@@ -90,8 +90,6 @@ public abstract class VanillaChronicleHash<K,
public int actualSegments;
public HashSplitting hashSplitting;
public long entriesPerSegment;
public long chunkSize;
public int maxChunksPerEntry;
public long actualChunksPerSegmentTier;
@@ -176,8 +174,6 @@ public abstract class VanillaChronicleHash<K,
actualSegments = privateAPI.actualSegments();
hashSplitting = HashSplitting.Splitting.forSegments(actualSegments);
entriesPerSegment = privateAPI.entriesPerSegment();
chunkSize = privateAPI.chunkSize();
maxChunksPerEntry = privateAPI.maxChunksPerEntry();
actualChunksPerSegmentTier = privateAPI.actualChunksPerSegmentTier();
@@ -186,7 +182,7 @@ public abstract class VanillaChronicleHash<K,
segmentHeaderSize = privateAPI.segmentHeaderSize();
tierHashLookupValueBits = valueBits(actualChunksPerSegmentTier);
tierHashLookupKeyBits = keyBits(entriesPerSegment, tierHashLookupValueBits);
tierHashLookupKeyBits = keyBits(privateAPI.entriesPerSegment(), tierHashLookupValueBits);
tierHashLookupEntrySize =
entrySize(tierHashLookupKeyBits, tierHashLookupValueBits);
if (!privateAPI.aligned64BitMemoryOperationsAtomic() && tierHashLookupEntrySize > 4) {
@@ -244,8 +240,6 @@ public abstract class VanillaChronicleHash<K,
actualSegments = wireIn.read(() -> "actualSegments").int32();
hashSplitting = wireIn.read(() -> "hashSplitting").typedMarshallable();
entriesPerSegment = wireIn.read(() -> "entriesPerSegment").int64();
chunkSize = wireIn.read(() -> "chunkSize").int64();
maxChunksPerEntry = wireIn.read(() -> "maxChunksPerEntry").int32();
actualChunksPerSegmentTier = wireIn.read(() -> "actualChunksPerSegmentTier").int64();
@@ -290,8 +284,6 @@ public abstract class VanillaChronicleHash<K,
wireOut.write(() -> "actualSegments").int32(actualSegments);
wireOut.write(() -> "hashSplitting").typedMarshallable(hashSplitting);
wireOut.write(() -> "entriesPerSegment").int64(entriesPerSegment);
wireOut.write(() -> "chunkSize").int64(chunkSize);
wireOut.write(() -> "maxChunksPerEntry").int32(maxChunksPerEntry);
wireOut.write(() -> "actualChunksPerSegmentTier").int64(actualChunksPerSegmentTier);
src/test/java/net/openhft/chronicle/map/CHMUseCasesTest.java
+11 -6
View File
@@ -19,6 +19,7 @@ package net.openhft.chronicle.map;
import com.google.common.primitives.Chars;
import net.openhft.chronicle.bytes.Bytes;
import net.openhft.chronicle.bytes.BytesMarshallable;
import net.openhft.chronicle.core.Maths;
import net.openhft.chronicle.core.util.SerializableFunction;
import net.openhft.chronicle.core.values.*;
import net.openhft.chronicle.hash.serialization.DataAccess;
@@ -47,7 +48,9 @@ import java.util.*;
import java.util.concurrent.ExecutionException;
import java.util.function.BiFunction;
import static java.lang.Math.max;
import static java.util.Arrays.asList;
import static net.openhft.chronicle.core.Maths.divideRoundUp;
import static net.openhft.chronicle.map.fromdocs.OpenJDKAndHashMapExamplesTest.parseYYYYMMDD;
import static org.junit.Assert.*;
@@ -122,7 +125,7 @@ public class CHMUseCasesTest {
private void mapChecks() {
if (typeOfMap == TypeOfMap.SIMPLE)
checkJsonSerilization();
checkJsonSerialization();
}
private void assertArrayValueEquals(ChronicleMap map1, ChronicleMap map2) {
@@ -153,7 +156,7 @@ public class CHMUseCasesTest {
}
private void checkJsonSerilization() {
private void checkJsonSerialization() {
File file = null;
try {
file = File.createTempFile("chronicle-map-", ".json");
@@ -167,16 +170,18 @@ public class CHMUseCasesTest {
map1.getAll(file);
VanillaChronicleMap vanillaMap = (VanillaChronicleMap) map1;
ChronicleMapBuilder builder = ChronicleMapBuilder.of(map1.keyClass(),
map1.valueClass())
.entriesPerSegment(vanillaMap.entriesPerSegment)
ChronicleMapBuilder builder = ChronicleMap
.of(map1.keyClass(), map1.valueClass())
.entriesPerSegment(
max(divideRoundUp(map1.size(), vanillaMap.actualSegments), 1))
.actualSegments(vanillaMap.actualSegments)
.actualChunksPerSegmentTier(vanillaMap.actualChunksPerSegmentTier);
if (!vanillaMap.constantlySizedEntry) {
builder.actualChunkSize((int) vanillaMap.chunkSize);
builder.worstAlignment(vanillaMap.worstAlignment);
}
try (ChronicleMap<Integer, Double> actual = builder.create()) {
try (ChronicleMap actual = builder.create()) {
actual.putAll(file);