Merge remote-tracking branch 'origin/master'

This commit is contained in:
Rob Austin
2014-10-29 13:30:53 +00:00
6 changed files with 42 additions and 43 deletions
@@ -1153,19 +1153,6 @@ public class ChronicleMapTest {
.entries(10)
.minSegments(1)
.entrySize(10);
builder.entryAndValueAlignment(NO_ALIGNMENT);
builder.file(getPersistenceFile());
testOversizeEntriesPutRemoveReplace(
(VanillaChronicleMap<CharSequence, ?, ?, CharSequence, ?, ?>)
builder.create()
);
builder.entryAndValueAlignment(Alignment.OF_4_BYTES);
builder.file(getPersistenceFile());
testOversizeEntriesPutRemoveReplace(
(VanillaChronicleMap<CharSequence, ?, ?, CharSequence, ?, ?>)
builder.create()
);
builder.entryAndValueAlignment(OF_8_BYTES);
builder.file(getPersistenceFile());
testOversizeEntriesPutRemoveReplace(
(VanillaChronicleMap<CharSequence, ?, ?, CharSequence, ?, ?>)
@@ -42,7 +42,6 @@ public class Issue42 {
final ChronicleMap<CharSequence, CharSequence> map = ChronicleMapBuilder
.of(CharSequence.class, CharSequence.class)
.entryAndValueAlignment(NO_ALIGNMENT)
.entrySize(18)
.entries(15000000)
.minSegments(128).create();