TeamCity Automatic Merge from master into feature/java11

This commit is contained in:
Team City
2018-09-14 15:19:33 +01:00
7 changed files with 38 additions and 29 deletions
@@ -619,7 +619,7 @@ public class ChronicleMapTest {
.entries((long) entries)
.minSegments(1)
.averageKeySize(10)
.entryAndValueOffsetAlignment(4)
.entryAndValueOffsetAlignment(8)
.create()) {
LongValue value4 = Values.newNativeReference(LongValue.class);
LongValue value22 = Values.newNativeReference(LongValue.class);
@@ -651,9 +651,9 @@ public class ChronicleMapTest {
try (ChronicleMap<CharSequence, LongValue> map1 = ChronicleMapBuilder.of(CharSequence.class,
LongValue.class)
.entries((long) entries)
.minSegments(1)
// .minSegments(1)
.averageKeySize(10)
.entryAndValueOffsetAlignment(1)
// .entryAndValueOffsetAlignment(8)
.create()) {
LongValue value1 = Values.newNativeReference(LongValue.class);
LongValue value21 = Values.newNativeReference(LongValue.class);
@@ -56,6 +56,7 @@ public class DemoChronicleMapTest {
.putReturnsNull(true)
.removeReturnsNull(true)
.entries(maxEntries)
.entryAndValueOffsetAlignment(8)
.createPersistedTo(file)) {
IntValue key = Values.newHeapInstance(IntValue.class);
@@ -98,6 +99,7 @@ public class DemoChronicleMapTest {
.putReturnsNull(true)
.removeReturnsNull(true)
.entries(maxEntries)
.entryAndValueOffsetAlignment(8)
.createPersistedTo(file)) {
IntValue key = Values.newHeapInstance(IntValue.class);
@@ -23,6 +23,7 @@ import net.openhft.chronicle.map.ExternalMapQueryContext;
import net.openhft.chronicle.values.Values;
import org.junit.Test;
import java.io.Closeable;
import java.io.File;
import java.io.IOException;
import java.text.ParseException;
@@ -99,8 +100,7 @@ public class OpenJDKAndHashMapExamplesTest {
BondVOInterface bond = Values.newNativeReference(BondVOInterface.class);
// lookup the key and give me a reference I can update in a thread safe way.
try (net.openhft.chronicle.core.io.Closeable c =
chm.acquireContext("369604103", bond)) {
try (Closeable c = chm.acquireContext("369604103", bond)) {
// found a key and bond has been set
// get directly without touching the rest of the record.
long _matDate = bond.getMaturityDate();