diff --git a/src/main/java/net/openhft/chronicle/ChronicleHashBuilder.java b/src/main/java/net/openhft/chronicle/ChronicleHashBuilder.java index 517009267..a4bc99426 100644 --- a/src/main/java/net/openhft/chronicle/ChronicleHashBuilder.java +++ b/src/main/java/net/openhft/chronicle/ChronicleHashBuilder.java @@ -362,31 +362,20 @@ public interface ChronicleHashBuilderMultiple containers could give access to the same data simultaneously, either inside a - * single JVM or across processes. Access is synchronized correctly across all instances, i. e. - * hash container mapping the data from the first JVM isn't able to modify the data, - * concurrently accessed from the second JVM by another hash container instance, mapping the - * same data. - * - *

On container's {@link ChronicleHash#close() close()} the data isn't removed, it remains on - * disk and available to be opened again (given the same file name) or during different JVM - * run. + * Specifies that hash containers us the specified file, if create is called and this is not set + * the map will be created in off-heap memory, and changes will not be persisted to disk. If a + * file is provided all changes to the map are persisted to disk (this is an operating system + * guarantee) independently from JVM process lifecycle. * * @param file the file with existing hash container or a desired location of a new off-heap * persisted hash container - * @return a hash container mapped to the given file - * @throws IOException if any IO error, related to off-heap memory allocation or file mapping - * occurs + * @return this builder back * @see ChronicleHash#file() * @see ChronicleHash#close() - * @see #create() */ - C create(File file) throws IOException; + B file(File file) throws IOException; /** * Creates a new hash container, storing it's data in off-heap memory, not mapped to any file. @@ -401,4 +390,8 @@ public interface ChronicleHashBuilder implements Cloneable, private byte identifier = -1; private StatelessBuilder statelessBuilder; + private File file; ChronicleMapBuilder(Class keyClass, Class valueClass) { keyBuilder = new SerializationBuilder(keyClass, SerializationBuilder.Role.KEY); @@ -672,6 +673,12 @@ public class ChronicleMapBuilder implements Cloneable, return this; } + @Override + public ChronicleMapBuilder file(File file) throws IOException { + this.file = file; + return this; + } + public ChronicleMapBuilder valueMarshallerAndFactory( @NotNull BytesMarshaller valueMarshaller, @NotNull ObjectFactory valueFactory) { valueBuilder.marshaller(valueMarshaller, valueFactory); @@ -759,8 +766,7 @@ public class ChronicleMapBuilder implements Cloneable, return new ConstantValueProvider(defaultValue, metaValueWriter, valueWriter); } - @Override - public ChronicleMap create(File file) throws IOException { + public ChronicleMap createWithFile(File file) throws IOException { for (int i = 0; i < 10; i++) { if (file.exists() && file.length() > 0) { FileInputStream fis = new FileInputStream(file); @@ -810,10 +816,14 @@ public class ChronicleMapBuilder implements Cloneable, @Override public ChronicleMap create() throws IOException { - if (statelessBuilder != null) { + if (statelessBuilder != null) return createStatelessMap(statelessBuilder); - } + return (file != null) ? createWithFile(file) : createWithoutFile(); + + } + + private ChronicleMap createWithoutFile() throws IOException { VanillaChronicleMap map = newMap(); BytesStore bytesStore = new DirectStore(JDKObjectSerializer.INSTANCE, map.sizeInBytes(), true); @@ -824,11 +834,10 @@ public class ChronicleMapBuilder implements Cloneable, private ChronicleMap createStatelessMap(StatelessBuilder statelessBuilder) throws IOException { preMapConstruction(); - KeyValueSerializer keyValueSerializer = new KeyValueSerializer(this.keyBuilder, - this.valueBuilder); + final KeyValueSerializer keyValueSerializer + = new KeyValueSerializer(keyBuilder, valueBuilder); - return new StatelessMapClient(keyValueSerializer, - statelessBuilder); + return new StatelessMapClient(keyValueSerializer, statelessBuilder); } private VanillaChronicleMap newMap() throws IOException { diff --git a/src/main/java/net/openhft/chronicle/set/ChronicleSetBuilder.java b/src/main/java/net/openhft/chronicle/set/ChronicleSetBuilder.java index 3f2cef16f..0d81b8d7f 100644 --- a/src/main/java/net/openhft/chronicle/set/ChronicleSetBuilder.java +++ b/src/main/java/net/openhft/chronicle/set/ChronicleSetBuilder.java @@ -261,9 +261,9 @@ public class ChronicleSetBuilder } @Override - public ChronicleSet create(File file) throws IOException { - final ChronicleMap map = chronicleMapBuilder.create(file); - return new SetFromMap(map); + public ChronicleSetBuilder file(File file) throws IOException { + chronicleMapBuilder.file(file); + return this; } @Override @@ -272,5 +272,7 @@ public class ChronicleSetBuilder return new SetFromMap(map); } + + } diff --git a/src/test/java/eg/BigData.java b/src/test/java/eg/BigData.java index a40dde663..3dce277f5 100644 --- a/src/test/java/eg/BigData.java +++ b/src/test/java/eg/BigData.java @@ -51,7 +51,7 @@ public class BigData { String chmPath = dir + "/testmap-" + Long.toString(System.nanoTime(), 36); new File(chmPath).deleteOnExit(); try { - theMap = builder.create(new File(chmPath)); + theMap = builder.file(new File(chmPath)).create(); } catch (IOException e) { // TODO Auto-generated catch block e.printStackTrace(); diff --git a/src/test/java/net/openhft/chronicle/map/AcquireGetUsingMain.java b/src/test/java/net/openhft/chronicle/map/AcquireGetUsingMain.java index 3b465bd6e..0f961d832 100644 --- a/src/test/java/net/openhft/chronicle/map/AcquireGetUsingMain.java +++ b/src/test/java/net/openhft/chronicle/map/AcquireGetUsingMain.java @@ -27,8 +27,7 @@ import static org.junit.Assert.fail; public class AcquireGetUsingMain { public static void main(String[] args) throws Exception { File file = new File(System.getProperty("java.io.tmpdir") + "/test1"); - ChronicleMap theSharedMap = ChronicleMapBuilder.of(String.class, Data.class) - .create(file); + ChronicleMap theSharedMap = ChronicleMapBuilder.of(String.class, Data.class).file(file).create(); Data data = DataValueClasses.newDirectReference(Data.class); String processType = "testkey"; if (theSharedMap.getUsing(processType, data) == null) { diff --git a/src/test/java/net/openhft/chronicle/map/Builder.java b/src/test/java/net/openhft/chronicle/map/Builder.java index ae60b1915..19eaaffba 100644 --- a/src/test/java/net/openhft/chronicle/map/Builder.java +++ b/src/test/java/net/openhft/chronicle/map/Builder.java @@ -59,7 +59,7 @@ public class Builder { final int serverPort, final InetSocketAddress... endpoints) throws IOException { return (T) newTcpSocketShmBuilder(Integer.class, Void.class, - identifier, serverPort, endpoints).create(getPersistenceFile()); + identifier, serverPort, endpoints).create(); } public static ChronicleMapBuilder newTcpSocketShmBuilder( @@ -70,7 +70,6 @@ public class Builder { TcpReplicationConfig tcpConfig = TcpReplicationConfig.of(serverPort, endpoints) .heartBeatInterval(1L, TimeUnit.SECONDS); return ChronicleMapBuilder.of(kClass, vClass) - .entries(20000L) .replicators(identifier, tcpConfig); } diff --git a/src/test/java/net/openhft/chronicle/map/CHMLatencyTestMain.java b/src/test/java/net/openhft/chronicle/map/CHMLatencyTestMain.java index 31e6a0b05..310c3fecf 100644 --- a/src/test/java/net/openhft/chronicle/map/CHMLatencyTestMain.java +++ b/src/test/java/net/openhft/chronicle/map/CHMLatencyTestMain.java @@ -74,10 +74,8 @@ public class CHMLatencyTestMain { // File file = new File("testCHMLatency.deleteme"); file.delete(); ChronicleMap countersMap = ChronicleMapBuilder.of(LongValue.class, LongValue.class) - .entries(KEYS) - .entrySize(24) - .create(file); + .entrySize(24).create(); // add keys LongValue key = DataValueClasses.newInstance(LongValue.class); diff --git a/src/test/java/net/openhft/chronicle/map/CHMMetaDataTest.java b/src/test/java/net/openhft/chronicle/map/CHMMetaDataTest.java index 83ad0e11b..759678342 100644 --- a/src/test/java/net/openhft/chronicle/map/CHMMetaDataTest.java +++ b/src/test/java/net/openhft/chronicle/map/CHMMetaDataTest.java @@ -35,8 +35,7 @@ public class CHMMetaDataTest { new StringStringMapEventListener(new AtomicLong(1)); ChronicleMap map = ChronicleMapBuilder.of(String.class, String.class) .metaDataBytes(8) - .eventListener(listener) - .create(file); + .eventListener(listener).create(); try { map.put("a", "aye"); diff --git a/src/test/java/net/openhft/chronicle/map/CHMTest5.java b/src/test/java/net/openhft/chronicle/map/CHMTest5.java index b7c9543cc..fe653bb5e 100644 --- a/src/test/java/net/openhft/chronicle/map/CHMTest5.java +++ b/src/test/java/net/openhft/chronicle/map/CHMTest5.java @@ -41,8 +41,8 @@ public class CHMTest5 { //// end of test String chmPath = System.getProperty("java.io.tmpdir") + System.getProperty("file.separator") + "CHMTest5"; - ChronicleMap theSharedMap = builder - .create(new File(chmPath)); + + ChronicleMap theSharedMap = builder.file(new File(chmPath)).create(); //Now get the shared data object, auto-creating if it's not there CHMTest5Data data = DataValueClasses.newDirectReference(CHMTest5Data.class); diff --git a/src/test/java/net/openhft/chronicle/map/CHMTestIterator1.java b/src/test/java/net/openhft/chronicle/map/CHMTestIterator1.java index 9de26c9a7..e5781f76d 100644 --- a/src/test/java/net/openhft/chronicle/map/CHMTestIterator1.java +++ b/src/test/java/net/openhft/chronicle/map/CHMTestIterator1.java @@ -16,7 +16,6 @@ package net.openhft.chronicle.map; -import java.io.File; import java.util.Map; import java.util.concurrent.atomic.AtomicLong; @@ -31,8 +30,8 @@ public class CHMTestIterator1 { int runs = 3000000; ChronicleMapBuilder builder = ChronicleMapBuilder.of(String.class, Long.class) .entries(runs); - String chmPath = System.getProperty("java.io.tmpdir") + System.getProperty("file.separator") + "CHMTestIterator1"; - ChronicleMap chm = builder.create(new File(chmPath)); + + ChronicleMap chm = builder.create(); /*chm.put("k1", alValue.incrementAndGet()); chm.put("k2", alValue.incrementAndGet()); chm.put("k3", alValue.incrementAndGet()); diff --git a/src/test/java/net/openhft/chronicle/map/ChannelReplicationTest.java b/src/test/java/net/openhft/chronicle/map/ChannelReplicationTest.java index 086dffb86..d16f18319 100644 --- a/src/test/java/net/openhft/chronicle/map/ChannelReplicationTest.java +++ b/src/test/java/net/openhft/chronicle/map/ChannelReplicationTest.java @@ -27,7 +27,6 @@ import java.io.IOException; import java.net.InetSocketAddress; import static java.util.concurrent.TimeUnit.SECONDS; -import static net.openhft.chronicle.map.Builder.getPersistenceFile; import static org.junit.Assert.assertTrue; /** @@ -61,8 +60,7 @@ public class ChannelReplicationTest { map1a = ChronicleMapBuilder.of(Integer.class, CharSequence.class) .entries(1000) - .channel(channelProviderA.createChannel((short) 1)) - .create(getPersistenceFile()); + .channel(channelProviderA.createChannel((short) 1)).create(); } { @@ -74,8 +72,7 @@ public class ChannelReplicationTest { map1b = ChronicleMapBuilder.of(Integer.class, CharSequence.class) .entries(1000) - .channel(channelProviderB.createChannel((short) 1)) - .create(getPersistenceFile()); + .channel(channelProviderB.createChannel((short) 1)).create(); } } @@ -97,14 +94,12 @@ public class ChannelReplicationTest { map2b = ChronicleMapBuilder.of(Integer.class, CharSequence.class) .entries(1000) - .channel(channelProviderB.createChannel((short) 2)) - .create(getPersistenceFile()); + .channel(channelProviderB.createChannel((short) 2)).create(); map2a = ChronicleMapBuilder.of(Integer.class, CharSequence.class) .entries(1000) - .channel(channelProviderA.createChannel((short) 2)) - .create(getPersistenceFile()); + .channel(channelProviderA.createChannel((short) 2)).create(); map2a.put(1, "EXAMPLE-2"); map1a.put(1, "EXAMPLE-1"); diff --git a/src/test/java/net/openhft/chronicle/map/ChronicleMapTest.java b/src/test/java/net/openhft/chronicle/map/ChronicleMapTest.java index aaa6ec54d..36b245765 100644 --- a/src/test/java/net/openhft/chronicle/map/ChronicleMapTest.java +++ b/src/test/java/net/openhft/chronicle/map/ChronicleMapTest.java @@ -114,8 +114,7 @@ public class ChronicleMapTest { .entrySize(entrySize) .entryAndValueAlignment(alignment) .valueMarshallerAndFactory(ByteableLongValueMarshaller.INSTANCE, - DirectLongValueFactory.INSTANCE) - .create(getPersistenceFile()); + DirectLongValueFactory.INSTANCE).create(); } private static void printStatus() { @@ -137,8 +136,7 @@ public class ChronicleMapTest { final ChronicleMap map = ChronicleMapBuilder.of(CharSequence.class, CharSequence.class) - .minSegments(2) - .create(getPersistenceFile()); + .minSegments(2).create(); assertFalse(map.containsKey("key3")); map.put("key1", "one"); @@ -184,8 +182,7 @@ public class ChronicleMapTest { final ChronicleMap map = ChronicleMapBuilder.of(CharSequence.class, CharSequence.class) .minSegments(1024) - .removeReturnsNull(true) - .create(getPersistenceFile()); + .removeReturnsNull(true).create(); for (int i = 1; i < 1024; i++) { @@ -207,8 +204,7 @@ public class ChronicleMapTest { int count = 300; final ChronicleMap map = ChronicleMapBuilder.of(Object.class, Object.class) .entrySize(count) - .minSegments(2) - .create(getPersistenceFile()); + .minSegments(2).create(); for (int i = 1; i < count; i++) { @@ -233,8 +229,7 @@ public class ChronicleMapTest { final ChronicleMap map = ChronicleMapBuilder.of(CharSequence.class, CharSequence.class) .minSegments(2) - .removeReturnsNull(true) - .create(getPersistenceFile()); + .removeReturnsNull(true).create(); assertFalse(map.containsKey("key3")); map.put("key1", "one"); @@ -279,8 +274,7 @@ public class ChronicleMapTest { final ChronicleMap map = ChronicleMapBuilder.of(CharSequence.class, CharSequence.class) - .minSegments(2) - .create(getPersistenceFile()); + .minSegments(2).create(); map.put("key1", "one"); @@ -345,8 +339,7 @@ public class ChronicleMapTest { final ChronicleMap map = ChronicleMapBuilder.of(CharSequence.class, CharSequence.class) - .minSegments(2) - .create(getPersistenceFile()); + .minSegments(2).create(); map.put("key1", "one"); map.put("key2", "two"); @@ -388,8 +381,7 @@ public class ChronicleMapTest { final ChronicleMap map = ChronicleMapBuilder.of(CharSequence.class, CharSequence.class) - .minSegments(2) - .create(getPersistenceFile()); + .minSegments(2).create(); map.put("key1", "one"); @@ -591,7 +583,8 @@ public class ChronicleMapTest { .entrySize(20) .valueMarshallerAndFactory(ByteableIntValueMarshaller.INSTANCE, DirectIntValueFactory.INSTANCE); - final ChronicleMap map = builder.create(getPersistenceFile()); + + final ChronicleMap map = builder.create(); int procs = Runtime.getRuntime().availableProcessors(); int threads = procs * 2; // runs > 100 ? procs / 2 : procs; @@ -713,8 +706,7 @@ public class ChronicleMapTest { .minSegments(16) .entrySize(32) .putReturnsNull(true) - .removeReturnsNull(true) - .create(getPersistenceFile()); + .removeReturnsNull(true).create(); StringBuilder key = new StringBuilder(); StringBuilder value = new StringBuilder(); StringBuilder value2 = new StringBuilder(); @@ -1144,8 +1136,7 @@ public class ChronicleMapTest { .minSegments(16) .entrySize(32) .putReturnsNull(true) - .removeReturnsNull(true) - .create(getPersistenceFile()); + .removeReturnsNull(true).create(); int[] expectedKeys = new int[noOfElements]; String[] expectedValues = new String[noOfElements]; @@ -1166,19 +1157,22 @@ public class ChronicleMapTest { .minSegments(1) .entrySize(10); builder.entryAndValueAlignment(NO_ALIGNMENT); + builder.file(getPersistenceFile()); testOversizeEntriesPutRemoveReplace( (VanillaChronicleMap) - builder.create(getPersistenceFile()) + builder.create() ); builder.entryAndValueAlignment(Alignment.OF_4_BYTES); + builder.file(getPersistenceFile()); testOversizeEntriesPutRemoveReplace( (VanillaChronicleMap) - builder.create(getPersistenceFile()) + builder.create() ); builder.entryAndValueAlignment(OF_8_BYTES); + builder.file(getPersistenceFile()); testOversizeEntriesPutRemoveReplace( (VanillaChronicleMap) - builder.create(getPersistenceFile()) + builder.create() ); } @@ -1225,13 +1219,13 @@ public class ChronicleMapTest { @Test public void equalsTest() throws IOException { final ChronicleMap map1 = ChronicleMapBuilder - .of(Integer.class, String.class).create(getPersistenceFile()); + .of(Integer.class, String.class).create(); map1.put(1, "one"); map1.put(2, "two"); final ChronicleMap map2 = ChronicleMapBuilder - .of(Integer.class, String.class).create(getPersistenceFile()); + .of(Integer.class, String.class).create(); map2.put(1, "one"); map2.put(2, "two"); diff --git a/src/test/java/net/openhft/chronicle/map/DefaultValueTest.java b/src/test/java/net/openhft/chronicle/map/DefaultValueTest.java index 5cad7bdbd..d21f46c2e 100644 --- a/src/test/java/net/openhft/chronicle/map/DefaultValueTest.java +++ b/src/test/java/net/openhft/chronicle/map/DefaultValueTest.java @@ -37,8 +37,7 @@ public class DefaultValueTest { defaultValue.add(42); try (ChronicleMap> map = ChronicleMapBuilder .of(String.class, (Class>) ((Class) List.class)) - .defaultValue(defaultValue) - .create(file)) { + .defaultValue(defaultValue).file(file).create()) { assertEquals(defaultValue, map.get("a")); assertEquals(1, map.size()); @@ -48,7 +47,8 @@ public class DefaultValueTest { } try (ChronicleMap> map = ChronicleMapBuilder - .of(String.class, (Class>) ((Class) List.class)).create(file)) { + .of(String.class, (Class>) ((Class) List.class)).file(file). + create()) { assertEquals(defaultValue, map.get("c")); } } finally { diff --git a/src/test/java/net/openhft/chronicle/map/GuavaTest.java b/src/test/java/net/openhft/chronicle/map/GuavaTest.java index 116170253..021ca0e8c 100644 --- a/src/test/java/net/openhft/chronicle/map/GuavaTest.java +++ b/src/test/java/net/openhft/chronicle/map/GuavaTest.java @@ -30,7 +30,6 @@ import java.util.List; import java.util.Map; import static com.google.common.collect.testing.features.MapFeature.*; -import static net.openhft.chronicle.map.ChronicleMapTest.getPersistenceFile; public class GuavaTest extends TestCase { @@ -106,7 +105,7 @@ public class GuavaTest extends TestCase { @Override Map newMap() { try { - return builder.create(getPersistenceFile()); + return builder.create(); } catch (IOException e) { throw new AssertionError(e); } diff --git a/src/test/java/net/openhft/chronicle/map/IntValueMapTest.java b/src/test/java/net/openhft/chronicle/map/IntValueMapTest.java index 1f2fb566b..eccda7174 100644 --- a/src/test/java/net/openhft/chronicle/map/IntValueMapTest.java +++ b/src/test/java/net/openhft/chronicle/map/IntValueMapTest.java @@ -24,7 +24,6 @@ import org.junit.Test; import java.io.IOException; import java.nio.ByteBuffer; -import static net.openhft.chronicle.map.Builder.getPersistenceFile; import static org.junit.Assert.assertEquals; @@ -39,8 +38,7 @@ public class IntValueMapTest { final ChronicleMap map = ChronicleMapBuilder .of(IntValue.class, CharSequence.class) .entries(20000) - .keyMarshaller(ByteableIntValueMarshaller.INSTANCE) - .create(getPersistenceFile()); + .keyMarshaller(ByteableIntValueMarshaller.INSTANCE).create(); IntValue$$Native value = new IntValue$$Native(); value.bytes(new ByteBufferBytes(ByteBuffer.allocateDirect(4)), 0); diff --git a/src/test/java/net/openhft/chronicle/map/Issue42.java b/src/test/java/net/openhft/chronicle/map/Issue42.java index 01814ed3a..e60ce5cc3 100644 --- a/src/test/java/net/openhft/chronicle/map/Issue42.java +++ b/src/test/java/net/openhft/chronicle/map/Issue42.java @@ -22,7 +22,6 @@ import org.testng.Assert; import java.io.IOException; import static net.openhft.chronicle.map.Alignment.NO_ALIGNMENT; -import static net.openhft.chronicle.map.Builder.getPersistenceFile; public class Issue42 { @@ -44,8 +43,7 @@ public class Issue42 { .entryAndValueAlignment(NO_ALIGNMENT) .entrySize(18) .entries(15000000) - .minSegments(128) - .create(getPersistenceFile()); + .minSegments(128).create(); for (int i = 0; i < 10000000; ++i) { String s = String.valueOf(i); diff --git a/src/test/java/net/openhft/chronicle/map/KeySizesTest.java b/src/test/java/net/openhft/chronicle/map/KeySizesTest.java index 6b651851e..0135a53c6 100644 --- a/src/test/java/net/openhft/chronicle/map/KeySizesTest.java +++ b/src/test/java/net/openhft/chronicle/map/KeySizesTest.java @@ -19,7 +19,6 @@ package net.openhft.chronicle.map; import org.junit.Test; import java.io.Closeable; -import java.io.File; import java.io.IOException; import java.util.Map; @@ -31,10 +30,8 @@ import static org.junit.Assert.assertEquals; public class KeySizesTest { @Test public void testDifferentKeySizes() throws IOException { - File tempFile = File.createTempFile("delete", "me"); - Map map = ChronicleMapBuilder.of(String.class, String.class) - .create(tempFile); + Map map = ChronicleMapBuilder.of(String.class, String.class).create(); String k = ""; for (int i = 0; i < 100; i++) { @@ -51,6 +48,6 @@ public class KeySizesTest { } ((Closeable) map).close(); - tempFile.delete(); + } } diff --git a/src/test/java/net/openhft/chronicle/map/OSResizesMain.java b/src/test/java/net/openhft/chronicle/map/OSResizesMain.java index 34f8907a7..9d116eaa9 100644 --- a/src/test/java/net/openhft/chronicle/map/OSResizesMain.java +++ b/src/test/java/net/openhft/chronicle/map/OSResizesMain.java @@ -35,8 +35,7 @@ public class OSResizesMain { File file = File.createTempFile("over-sized", "deleteme"); ChronicleMap map = ChronicleMapBuilder.of(String.class, String.class) .entrySize(100 * 1024 * 1024) - .entries(1000000) - .create(file); + .entries(1000000).create(); for (int i = 0; i < 10000; i++) { char[] chars = new char[i]; Arrays.fill(chars, '+'); diff --git a/src/test/java/net/openhft/chronicle/map/PostChannelCreationTest.java b/src/test/java/net/openhft/chronicle/map/PostChannelCreationTest.java index f5292974c..a75138d6a 100644 --- a/src/test/java/net/openhft/chronicle/map/PostChannelCreationTest.java +++ b/src/test/java/net/openhft/chronicle/map/PostChannelCreationTest.java @@ -69,13 +69,11 @@ public class PostChannelCreationTest { // this is how you add maps after the custer is created map1a = ChronicleMapBuilder.of(Integer.class, CharSequence.class) .entries(1000) - .channel(channelProviderA.createChannel((short) 1)) - .create(getPersistenceFile()); + .channel(channelProviderA.createChannel((short) 1)).create(); map2a = ChronicleMapBuilder.of(Integer.class, CharSequence.class) .entries(1000) - .channel(channelProviderA.createChannel((short) 2)) - .create(getPersistenceFile()); + .channel(channelProviderA.createChannel((short) 2)).create(); } @@ -90,13 +88,11 @@ public class PostChannelCreationTest { // this is how you add maps after the custer is created map1b = ChronicleMapBuilder.of(Integer.class, CharSequence.class) .entries(1000) - .channel(channelProviderB.createChannel((short) 1)) - .create(getPersistenceFile()); + .channel(channelProviderB.createChannel((short) 1)).create(); map2b = ChronicleMapBuilder.of(Integer.class, CharSequence.class) .entries(1000) - .channel(channelProviderB.createChannel((short) 2)) - .create(getPersistenceFile()); + .channel(channelProviderB.createChannel((short) 2)).create(); } diff --git a/src/test/java/net/openhft/chronicle/map/ProcessInstanceLimiterMain.java b/src/test/java/net/openhft/chronicle/map/ProcessInstanceLimiterMain.java index 4affbcff1..bccc6f57c 100644 --- a/src/test/java/net/openhft/chronicle/map/ProcessInstanceLimiterMain.java +++ b/src/test/java/net/openhft/chronicle/map/ProcessInstanceLimiterMain.java @@ -39,7 +39,7 @@ public class ProcessInstanceLimiterMain implements Runnable { builder.entries(10000); builder.minSegments(2); File file = new File(System.getProperty("java.io.tmpdir") + "/" + sharedMapName); - this.theSharedMap = builder.create(file); + this.theSharedMap = builder.create(); Thread t = new Thread(this, "ProcessInstanceLimiterMain updater"); t.setDaemon(true); t.start(); diff --git a/src/test/java/net/openhft/chronicle/map/RecursiveRefereneChMapTest.java b/src/test/java/net/openhft/chronicle/map/RecursiveRefereneChMapTest.java index abe3ac3a7..ce3aa3de2 100644 --- a/src/test/java/net/openhft/chronicle/map/RecursiveRefereneChMapTest.java +++ b/src/test/java/net/openhft/chronicle/map/RecursiveRefereneChMapTest.java @@ -33,8 +33,7 @@ public class RecursiveRefereneChMapTest { file.deleteOnExit(); Map map = ChronicleMapBuilder.of(String.class, StupidCycle.class) .entries(64) - .objectSerializer(JDKObjectSerializer.INSTANCE) - .create(file); + .objectSerializer(JDKObjectSerializer.INSTANCE).create(); map.put("Test", new StupidCycle()); map.put("Test2", new StupidCycle2()); StupidCycle cycle = (StupidCycle) map.get("Test"); diff --git a/src/test/java/net/openhft/chronicle/map/ReplicatedChronicleMapTest.java b/src/test/java/net/openhft/chronicle/map/ReplicatedChronicleMapTest.java index 39738c5d3..5a7a69c24 100644 --- a/src/test/java/net/openhft/chronicle/map/ReplicatedChronicleMapTest.java +++ b/src/test/java/net/openhft/chronicle/map/ReplicatedChronicleMapTest.java @@ -46,7 +46,7 @@ public class ReplicatedChronicleMapTest extends JSR166TestCase { .entries(size).replicators((byte) 1); return ChronicleMapBuilder.of(Integer.class, CharSequence.class) .entries(size) - .create(getPersistenceFile()); + .create(); } @@ -55,7 +55,7 @@ public class ReplicatedChronicleMapTest extends JSR166TestCase { .entries(size).replicators((byte) 1); return ChronicleMapBuilder.of(ArrayList.class, CharSequence.class) .entries(size) - .create(getPersistenceFile()); + .create(); } @@ -63,7 +63,7 @@ public class ReplicatedChronicleMapTest extends JSR166TestCase { ChronicleMap newShmListBoolean() throws IOException { ChronicleMapBuilder.of(ArrayList.class, CharSequence.class).replicators((byte) 1); return ChronicleMapBuilder.of(ArrayList.class, CharSequence.class) - .create(getPersistenceFile()); + .create(); } @@ -72,7 +72,7 @@ public class ReplicatedChronicleMapTest extends JSR166TestCase { .entries(size).replicators((byte) 1); return ChronicleMapBuilder.of(CharSequence.class, CharSequence.class) .entries(size) - .create(getPersistenceFile()); + .create(); } @@ -80,13 +80,13 @@ public class ReplicatedChronicleMapTest extends JSR166TestCase { ChronicleMap newShmIntString() throws IOException { ChronicleMapBuilder.of(Integer.class, CharSequence.class).replicators((byte) 1); return ChronicleMapBuilder.of(Integer.class, CharSequence.class) - .create(getPersistenceFile()); + .create(); } ChronicleMap newShmBiBoolean() throws IOException { ChronicleMapBuilder.of(BI.class, Boolean.class).replicators((byte) 1); - return ChronicleMapBuilder.of(BI.class, Boolean.class).create(getPersistenceFile()); + return ChronicleMapBuilder.of(BI.class, Boolean.class).create(); } diff --git a/src/test/java/net/openhft/chronicle/map/SingleMapClusterTest.java b/src/test/java/net/openhft/chronicle/map/SingleMapClusterTest.java index 99c41eefa..7de230de2 100644 --- a/src/test/java/net/openhft/chronicle/map/SingleMapClusterTest.java +++ b/src/test/java/net/openhft/chronicle/map/SingleMapClusterTest.java @@ -67,8 +67,7 @@ public class SingleMapClusterTest { // this is how you add maps after the custer is created map1a = ChronicleMapBuilder.of(Integer.class, CharSequence.class) .entries(1000) - .channel(channelProviderA.createChannel((short) 1)) - .create(getPersistenceFile()); + .channel(channelProviderA.createChannel((short) 1)).create(); } @@ -83,8 +82,7 @@ public class SingleMapClusterTest { // this is how you add maps after the custer is created map1b = ChronicleMapBuilder.of(Integer.class, CharSequence.class) .channel(channelProviderB.createChannel((short) 1)) - .entries(1000) - .create(getPersistenceFile()); + .entries(1000).create(); } } diff --git a/src/test/java/net/openhft/chronicle/map/StatelessClientTest.java b/src/test/java/net/openhft/chronicle/map/StatelessClientTest.java index 402fb0322..124a6bc10 100644 --- a/src/test/java/net/openhft/chronicle/map/StatelessClientTest.java +++ b/src/test/java/net/openhft/chronicle/map/StatelessClientTest.java @@ -8,7 +8,6 @@ import java.net.InetSocketAddress; import static java.util.concurrent.TimeUnit.SECONDS; import static net.openhft.chronicle.StatelessBuilder.remoteAddress; -import static net.openhft.chronicle.map.Builder.getPersistenceFile; import static net.openhft.chronicle.map.TcpReplicationConfig.of; /** @@ -28,8 +27,7 @@ public class StatelessClientTest { serverMap = ChronicleMapBuilder.of(Integer.class, CharSequence.class) .entries(20000L) - .replicators((byte) 2, of(8076).heartBeatInterval(1L, SECONDS)) - .create(getPersistenceFile()); + .replicators((byte) 2, of(8076).heartBeatInterval(1L, SECONDS)).create(); serverMap.put(10, "EXAMPLE-10"); } diff --git a/src/test/java/net/openhft/chronicle/map/TCPSocketReplication4WayMapTest.java b/src/test/java/net/openhft/chronicle/map/TCPSocketReplication4WayMapTest.java index 5671d9c3d..15033398e 100644 --- a/src/test/java/net/openhft/chronicle/map/TCPSocketReplication4WayMapTest.java +++ b/src/test/java/net/openhft/chronicle/map/TCPSocketReplication4WayMapTest.java @@ -26,7 +26,6 @@ import java.io.Closeable; import java.io.IOException; import java.net.InetSocketAddress; -import static net.openhft.chronicle.map.Builder.getPersistenceFile; import static net.openhft.chronicle.map.Builder.newTcpSocketShmBuilder; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -48,7 +47,7 @@ public class TCPSocketReplication4WayMapTest { final int serverPort, final InetSocketAddress... endpoints) throws IOException { return (T) newTcpSocketShmBuilder(Integer.class, CharSequence.class, - identifier, serverPort, endpoints).create(getPersistenceFile()); + identifier, serverPort, endpoints).create(); } @@ -60,8 +59,7 @@ public class TCPSocketReplication4WayMapTest { return newTcpSocketShmBuilder(IntValue.class, CharSequence.class, identifier, serverPort, endpoints) .entries(20000L) - .keyMarshaller(ByteableIntValueMarshaller.INSTANCE) - .create(getPersistenceFile()); + .keyMarshaller(ByteableIntValueMarshaller.INSTANCE).create(); } diff --git a/src/test/java/net/openhft/chronicle/map/TCPSocketReplicationBootStrapTests.java b/src/test/java/net/openhft/chronicle/map/TCPSocketReplicationBootStrapTests.java index 0a2c8fed1..70873cbee 100644 --- a/src/test/java/net/openhft/chronicle/map/TCPSocketReplicationBootStrapTests.java +++ b/src/test/java/net/openhft/chronicle/map/TCPSocketReplicationBootStrapTests.java @@ -49,7 +49,7 @@ public class TCPSocketReplicationBootStrapTests { newTcpSocketShmBuilder(Integer.class, CharSequence.class, (byte) 2, 8076, new InetSocketAddress("localhost", 8079)); final ChronicleMap map2a = - map2aBuilder.create(getPersistenceFile()); + map2aBuilder.file(getPersistenceFile()).create(); map2a.put(10, "EXAMPLE-10"); // this will be the last time that map1 go an update from map2 long lastModificationTime; @@ -67,14 +67,16 @@ public class TCPSocketReplicationBootStrapTests { // restart map 2 but don't doConnect it to map one final ChronicleMap map2b = ChronicleMapBuilder.of(Integer.class, CharSequence.class) - .create(map2File); + .file(map2File) + .create(); // add data into it map2b.put(11, "ADDED WHEN DISCONNECTED TO MAP1"); map2b.close(); } // now restart map2a and doConnect it to map1, map1 should bootstrap the missing entry - map2 = map2aBuilder.create(map2File); + map2aBuilder.file(map2File); + map2 = map2aBuilder.create(); // add data into it waitTillEqual(5000); @@ -88,9 +90,10 @@ public class TCPSocketReplicationBootStrapTests { map1 = newTcpSocketShmIntString((byte) 1, 8079, new InetSocketAddress("localhost", 8076)); ChronicleMapBuilder map2aBuilder = newTcpSocketShmBuilder(Integer.class, CharSequence.class, (byte) 2, 8076); + final ReplicatedChronicleMap map2a = (ReplicatedChronicleMap) - map2aBuilder.create(getPersistenceFile()); + map2aBuilder.file(getPersistenceFile()).create(); map2a.put(10, "EXAMPLE-10"); // this will be the last time that map1 go an update from map2 @@ -107,16 +110,18 @@ public class TCPSocketReplicationBootStrapTests { { // restart map 2 but don't doConnect it to map one + ChronicleMapBuilder.of(Integer.class, CharSequence.class).file(map2File); final ChronicleMap map2b = - ChronicleMapBuilder.of(Integer.class, CharSequence.class) - .create(map2File); + ChronicleMapBuilder.of(Integer.class, CharSequence.class).file(map2File). + create(); // add data into it map2b.put(11, "ADDED WHEN DISCONNECTED TO MAP1"); map2b.close(); } // now restart map2a and doConnect it to map1, map1 should bootstrap the missing entry - map2 = map2aBuilder.create(map2File); + map2aBuilder.file(map2File); + map2 = map2aBuilder.create(); // add data into it waitTillEqual(20000); diff --git a/src/test/java/net/openhft/chronicle/map/TCPSocketReplicationIntValueTest.java b/src/test/java/net/openhft/chronicle/map/TCPSocketReplicationIntValueTest.java index 78b342987..1342d146d 100644 --- a/src/test/java/net/openhft/chronicle/map/TCPSocketReplicationIntValueTest.java +++ b/src/test/java/net/openhft/chronicle/map/TCPSocketReplicationIntValueTest.java @@ -55,8 +55,8 @@ public class TCPSocketReplicationIntValueTest { value.bytes(new ByteBufferBytes(ByteBuffer.allocateDirect(4)), 0); map1Builder = newTcpSocketShmBuilder(IntValue.class, CharSequence.class, (byte) 1, 8076, new InetSocketAddress("localhost", 8077)); - map1 = map1Builder.keyMarshaller(ByteableIntValueMarshaller.INSTANCE) - .create(getPersistenceFile()); + map1Builder.keyMarshaller(ByteableIntValueMarshaller.INSTANCE).file(getPersistenceFile()); + map1 = map1Builder.keyMarshaller(ByteableIntValueMarshaller.INSTANCE).create(); map2 = newTcpSocketShmIntValueString((byte) 2, 8077); } diff --git a/src/test/java/net/openhft/chronicle/map/TCPSocketReplicationTest.java b/src/test/java/net/openhft/chronicle/map/TCPSocketReplicationTest.java index e8ac1f7f7..7b619711f 100644 --- a/src/test/java/net/openhft/chronicle/map/TCPSocketReplicationTest.java +++ b/src/test/java/net/openhft/chronicle/map/TCPSocketReplicationTest.java @@ -48,7 +48,8 @@ public class TCPSocketReplicationTest { ChronicleMapBuilder map1Builder = newTcpSocketShmBuilder(Integer.class, CharSequence.class, (byte) 1, 8076, new InetSocketAddress("localhost", 8077)); - map1 = map1Builder.create(getPersistenceFile()); + map1Builder.file(getPersistenceFile()); + map1 = map1Builder.create(); map2 = newTcpSocketShmIntString((byte) 2, 8077); } diff --git a/src/test/java/net/openhft/chronicle/map/TCPSocketReplicationTest3wayPutReturnsNull.java b/src/test/java/net/openhft/chronicle/map/TCPSocketReplicationTest3wayPutReturnsNull.java index e8925e4fb..19a100e13 100644 --- a/src/test/java/net/openhft/chronicle/map/TCPSocketReplicationTest3wayPutReturnsNull.java +++ b/src/test/java/net/openhft/chronicle/map/TCPSocketReplicationTest3wayPutReturnsNull.java @@ -45,12 +45,10 @@ public class TCPSocketReplicationTest3wayPutReturnsNull { final int serverPort, final InetSocketAddress... endpoints) throws IOException { TcpReplicationConfig tcpConfig = TcpReplicationConfig.of(serverPort, endpoints); - return (T) ChronicleMapBuilder.of(Integer.class, CharSequence.class) - .entries(1000) + return (T) ChronicleMapBuilder.of(Integer.class, CharSequence.class) .putReturnsNull(true) - .replicators(identifier, tcpConfig) - .create(Builder.getPersistenceFile()); + .replicators(identifier, tcpConfig).create(); } diff --git a/src/test/java/net/openhft/chronicle/map/TCPSocketReplicationTestPostConnection.java b/src/test/java/net/openhft/chronicle/map/TCPSocketReplicationTestPostConnection.java index b39ab79b1..9f1f4f25e 100644 --- a/src/test/java/net/openhft/chronicle/map/TCPSocketReplicationTestPostConnection.java +++ b/src/test/java/net/openhft/chronicle/map/TCPSocketReplicationTestPostConnection.java @@ -77,8 +77,9 @@ public class TCPSocketReplicationTestPostConnection { ChronicleMapBuilder map2aBuilder = newTcpSocketShmBuilder(Integer.class, CharSequence.class, (byte) 2, 8077, new InetSocketAddress("localhost", 8076)); + map2aBuilder.file(Builder.getPersistenceFile()); final ChronicleMap map2a = - map2aBuilder.create(Builder.getPersistenceFile()); + map2aBuilder.create(); map1 = TCPSocketReplication4WayMapTest.newTcpSocketShmIntString((byte) 1, 8076); Thread.sleep(1); @@ -91,7 +92,8 @@ public class TCPSocketReplicationTestPostConnection { map1.put(6, "EXAMPLE-1"); // recreate map2 with new unique file - map2 = map2aBuilder.create(Builder.getPersistenceFile()); + map2aBuilder.file(Builder.getPersistenceFile()); + map2 = map2aBuilder.create(); // allow time for the recompilation to resolve diff --git a/src/test/java/net/openhft/chronicle/map/TimeBasedReplicationTests.java b/src/test/java/net/openhft/chronicle/map/TimeBasedReplicationTests.java index 51d1b54f8..bb9fa762f 100644 --- a/src/test/java/net/openhft/chronicle/map/TimeBasedReplicationTests.java +++ b/src/test/java/net/openhft/chronicle/map/TimeBasedReplicationTests.java @@ -52,8 +52,7 @@ public class TimeBasedReplicationTests extends JSR166TestCase { .entries(10).replicators((byte) 1); ChronicleMap map = ChronicleMapBuilder.of(CharSequence.class, CharSequence.class) .replicators((byte) 1) - .timeProvider(timeProvider) - .create(getPersistenceFile()); + .timeProvider(timeProvider).create(); current(timeProvider); @@ -83,8 +82,7 @@ public class TimeBasedReplicationTests extends JSR166TestCase { .entries(10).replicators((byte) 1); ChronicleMap map = ChronicleMapBuilder.of(CharSequence.class, CharSequence.class) .replicators((byte) 1) - .timeProvider(timeProvider) - .create(getPersistenceFile()); + .timeProvider(timeProvider).create(); current(timeProvider); @@ -115,8 +113,7 @@ public class TimeBasedReplicationTests extends JSR166TestCase { .entries(10).replicators((byte) 1); ChronicleMap map = ChronicleMapBuilder.of(CharSequence.class, CharSequence.class) .replicators((byte) 1) - .timeProvider(timeProvider) - .create(getPersistenceFile()); + .timeProvider(timeProvider).create(); current(timeProvider); @@ -148,10 +145,12 @@ public class TimeBasedReplicationTests extends JSR166TestCase { final TimeProvider timeProvider = Mockito.mock(TimeProvider.class); ChronicleMapBuilder.of(CharSequence.class, CharSequence.class) .entries(10).replicators((byte) 1); + ChronicleMapBuilder.of(CharSequence.class, CharSequence.class) + .replicators((byte) 1) + .timeProvider(timeProvider).file(getPersistenceFile()); ChronicleMap map = ChronicleMapBuilder.of(CharSequence.class, CharSequence.class) .replicators((byte) 1) - .timeProvider(timeProvider) - .create(getPersistenceFile()); + .timeProvider(timeProvider).create(); current(timeProvider); @@ -179,10 +178,12 @@ public class TimeBasedReplicationTests extends JSR166TestCase { final TimeProvider timeProvider = Mockito.mock(TimeProvider.class); ChronicleMapBuilder.of(CharSequence.class, CharSequence.class).replicators((byte) 1); + ChronicleMapBuilder.of(CharSequence.class, CharSequence.class) + .replicators((byte) 1) + .timeProvider(timeProvider).file(getPersistenceFile()); ChronicleMap map = ChronicleMapBuilder.of(CharSequence.class, CharSequence.class) .replicators((byte) 1) - .timeProvider(timeProvider) - .create(getPersistenceFile()); + .timeProvider(timeProvider).create(); current(timeProvider); @@ -209,10 +210,12 @@ public class TimeBasedReplicationTests extends JSR166TestCase { final TimeProvider timeProvider = Mockito.mock(TimeProvider.class); ChronicleMapBuilder.of(CharSequence.class, CharSequence.class).replicators((byte) 1); + ChronicleMapBuilder.of(CharSequence.class, CharSequence.class) + .replicators((byte) 1) + .timeProvider(timeProvider).file(getPersistenceFile()); ChronicleMap map = ChronicleMapBuilder.of(CharSequence.class, CharSequence.class) .replicators((byte) 1) - .timeProvider(timeProvider) - .create(getPersistenceFile()); + .timeProvider(timeProvider).create(); current(timeProvider); @@ -239,10 +242,12 @@ public class TimeBasedReplicationTests extends JSR166TestCase { final TimeProvider timeProvider = Mockito.mock(TimeProvider.class); ChronicleMapBuilder.of(CharSequence.class, CharSequence.class).replicators((byte) 1); + ChronicleMapBuilder.of(CharSequence.class, CharSequence.class) + .replicators((byte) 1) + .timeProvider(timeProvider).file(getPersistenceFile()); ReplicatedChronicleMap map = (ReplicatedChronicleMap) ChronicleMapBuilder.of(CharSequence.class, CharSequence.class) .replicators((byte) 1) - .timeProvider(timeProvider) - .create(getPersistenceFile()); + .timeProvider(timeProvider).create(); current(timeProvider); @@ -270,10 +275,12 @@ public class TimeBasedReplicationTests extends JSR166TestCase { final TimeProvider timeProvider = Mockito.mock(TimeProvider.class); ChronicleMapBuilder.of(CharSequence.class, CharSequence.class).replicators((byte) 1); + ChronicleMapBuilder.of(CharSequence.class, CharSequence.class) + .replicators((byte) 1) + .timeProvider(timeProvider).file(getPersistenceFile()); ReplicatedChronicleMap map = (ReplicatedChronicleMap) ChronicleMapBuilder.of(CharSequence.class, CharSequence.class) .replicators((byte) 1) - .timeProvider(timeProvider) - .create(getPersistenceFile()); + .timeProvider(timeProvider).create(); current(timeProvider); @@ -300,12 +307,16 @@ public class TimeBasedReplicationTests extends JSR166TestCase { public void testRemoveFollowedByLatePut() throws IOException { final TimeProvider timeProvider = Mockito.mock(TimeProvider.class); + ChronicleMapBuilder.of(CharSequence.class, CharSequence.class) + .entries(10) + .replicators((byte) 1) + .entries(10) + .timeProvider(timeProvider).file(getPersistenceFile()); ReplicatedChronicleMap map = (ReplicatedChronicleMap) ChronicleMapBuilder.of(CharSequence.class, CharSequence.class) .entries(10) .replicators((byte) 1) .entries(10) - .timeProvider(timeProvider) - .create(getPersistenceFile()); + .timeProvider(timeProvider).create(); current(timeProvider); @@ -332,11 +343,14 @@ public class TimeBasedReplicationTests extends JSR166TestCase { final TimeProvider timeProvider = Mockito.mock(TimeProvider.class); ChronicleMapBuilder.of(CharSequence.class, CharSequence.class) .entries(10).replicators((byte) 1); + ChronicleMapBuilder.of(CharSequence.class, CharSequence.class) + .entries(10) + .entries(10) + .timeProvider(timeProvider).file(getPersistenceFile()); ChronicleMap map = ChronicleMapBuilder.of(CharSequence.class, CharSequence.class) .entries(10) .entries(10) - .timeProvider(timeProvider) - .create(getPersistenceFile()); + .timeProvider(timeProvider).create(); current(timeProvider); diff --git a/src/test/java/net/openhft/chronicle/map/TwoMapOnDifferentServers.java b/src/test/java/net/openhft/chronicle/map/TwoMapOnDifferentServers.java index fd418c0c5..6ea3a06cd 100644 --- a/src/test/java/net/openhft/chronicle/map/TwoMapOnDifferentServers.java +++ b/src/test/java/net/openhft/chronicle/map/TwoMapOnDifferentServers.java @@ -51,13 +51,11 @@ public class TwoMapOnDifferentServers { File persistenceFile = getPersistenceFile(); map1 = ChronicleMapBuilder.of(Integer.class, CharSequence.class) .entries(20000) - .replicators((byte) 1, tcpConfig) - .create(persistenceFile); + .replicators((byte) 1, tcpConfig).create(); map2 = ChronicleMapBuilder.of(Integer.class, CharSequence.class) .entries(20000) - .replicators((byte) 2, of(8077).heartBeatInterval(1, SECONDS)) - .create(persistenceFile); + .replicators((byte) 2, of(8077).heartBeatInterval(1, SECONDS)).create(); } @After diff --git a/src/test/java/net/openhft/chronicle/map/UDPSocketReplicationTest.java b/src/test/java/net/openhft/chronicle/map/UDPSocketReplicationTest.java index 8a2550b74..3c0c72e91 100644 --- a/src/test/java/net/openhft/chronicle/map/UDPSocketReplicationTest.java +++ b/src/test/java/net/openhft/chronicle/map/UDPSocketReplicationTest.java @@ -42,8 +42,7 @@ public class UDPSocketReplicationTest { return ChronicleMapBuilder.of(Integer.class, CharSequence.class) .entries(1000) - .replicators((byte) identifier, udpConfig) - .create(Builder.getPersistenceFile()); + .replicators((byte) identifier, udpConfig).create(); } @Before diff --git a/src/test/java/net/openhft/chronicle/map/example/DistributedSequenceMain.java b/src/test/java/net/openhft/chronicle/map/example/DistributedSequenceMain.java index 1b583704c..eb9346b6e 100644 --- a/src/test/java/net/openhft/chronicle/map/example/DistributedSequenceMain.java +++ b/src/test/java/net/openhft/chronicle/map/example/DistributedSequenceMain.java @@ -12,11 +12,13 @@ public class DistributedSequenceMain { public static void main(String... ignored) throws IOException { Class longValueClass = DataValueClasses.directClassFor(LongValue.class); + ChronicleMapBuilder.of(String.class, longValueClass) + .entries(128) + .actualSegments(1).file(new File("/tmp/counters")); ChronicleMap map = ChronicleMapBuilder.of(String.class, longValueClass) .entries(128) - .actualSegments(1) - .create(new File("/tmp/counters")); + .actualSegments(1).create(); LongValue value = DataValueClasses.newDirectReference(longValueClass); map.acquireUsing("sequence", value); diff --git a/src/test/java/net/openhft/chronicle/map/fromdocs/OpenJDKAndHashMapExamplesTest.java b/src/test/java/net/openhft/chronicle/map/fromdocs/OpenJDKAndHashMapExamplesTest.java index 7c90b209e..b83270074 100644 --- a/src/test/java/net/openhft/chronicle/map/fromdocs/OpenJDKAndHashMapExamplesTest.java +++ b/src/test/java/net/openhft/chronicle/map/fromdocs/OpenJDKAndHashMapExamplesTest.java @@ -19,7 +19,6 @@ package net.openhft.chronicle.map.fromdocs; import net.openhft.affinity.AffinitySupport; import net.openhft.chronicle.map.ChronicleMap; import net.openhft.chronicle.map.ChronicleMapBuilder; -import net.openhft.lang.io.serialization.impl.NewInstanceObjectFactory; import net.openhft.lang.model.DataValueClasses; import org.junit.Test; @@ -57,7 +56,8 @@ public class OpenJDKAndHashMapExamplesTest { ChronicleMap chm = ChronicleMapBuilder .of(String.class, directClassFor(BondVOInterface.class)) .keySize(10) - .create(file); + .file(file) + .create(); BondVOInterface bondVO = DataValueClasses.newDirectReference(BondVOInterface.class); @@ -74,11 +74,11 @@ public class OpenJDKAndHashMapExamplesTest { mpx1030.setAskPx(109.7); mpx1030.setBidPx(107.6); - ChronicleMap chmB = ChronicleMapBuilder .of(String.class, directClassFor(BondVOInterface.class)) .keySize(10) - .create(file); + .file(file) + .create(); // ZERO Copy but creates a new off heap reference each time diff --git a/src/test/java/net/openhft/chronicle/map/fromdocs/pingpong_latency/PingPongCASLeft.java b/src/test/java/net/openhft/chronicle/map/fromdocs/pingpong_latency/PingPongCASLeft.java index 28aa4332e..47ec2aaa0 100644 --- a/src/test/java/net/openhft/chronicle/map/fromdocs/pingpong_latency/PingPongCASLeft.java +++ b/src/test/java/net/openhft/chronicle/map/fromdocs/pingpong_latency/PingPongCASLeft.java @@ -90,10 +90,13 @@ public class PingPongCASLeft { AffinitySupport.setThreadId(); String TMP = System.getProperty("java.io.tmpdir"); + ChronicleMapBuilder.of(String.class, BondVOInterface.class) + + .entries(16) + .entrySize(64).file(new File(TMP + "/BondPortfolioCHM")); return ChronicleMapBuilder.of(String.class, BondVOInterface.class) .entries(16) - .entrySize(64) - .create(new File(TMP + "/BondPortfolioCHM")); + .entrySize(64).create(); } } \ No newline at end of file diff --git a/src/test/java/net/openhft/chronicle/map/ipc/StateMachineTutorial.java b/src/test/java/net/openhft/chronicle/map/ipc/StateMachineTutorial.java index 00196986a..b1ff1d727 100644 --- a/src/test/java/net/openhft/chronicle/map/ipc/StateMachineTutorial.java +++ b/src/test/java/net/openhft/chronicle/map/ipc/StateMachineTutorial.java @@ -39,10 +39,12 @@ public class StateMachineTutorial { try { File dataFile = new File(System.getProperty("java.io.tmpdir"), "hft-state-machine"); + ChronicleMapBuilder.of(Integer.class, StateMachineData.class) + + .entries(8).file(dataFile); map = ChronicleMapBuilder.of(Integer.class, StateMachineData.class) - .entries(8) - .create(dataFile); + .entries(8).create(); if (args.length > 0) { if ("0".equalsIgnoreCase(args[0])) { diff --git a/src/test/java/net/openhft/chronicle/map/jrs166/map/ChronicleMapTest.java b/src/test/java/net/openhft/chronicle/map/jrs166/map/ChronicleMapTest.java index 46242e233..b422a87b4 100644 --- a/src/test/java/net/openhft/chronicle/map/jrs166/map/ChronicleMapTest.java +++ b/src/test/java/net/openhft/chronicle/map/jrs166/map/ChronicleMapTest.java @@ -48,49 +48,55 @@ public class ChronicleMapTest extends JSR166TestCase { static ChronicleMap newShmIntString(int size) throws IOException { + ChronicleMapBuilder.of(Integer.class, CharSequence.class) + .entries(size).file(getPersistenceFile()); return ChronicleMapBuilder.of(Integer.class, CharSequence.class) - .entries(size) - .create(getPersistenceFile()); + .entries(size).create(); } static ChronicleMap newShmListBoolean(int size) throws IOException { + ChronicleMapBuilder.of(ArrayList.class, CharSequence.class) + + .entries(size).file(getPersistenceFile()); return ChronicleMapBuilder.of(ArrayList.class, CharSequence.class) - .entries(size).create(getPersistenceFile()); + .entries(size).create(); } static ChronicleMap newShmListBoolean() throws IOException { - return ChronicleMapBuilder.of(ArrayList.class, CharSequence.class) - - .create(getPersistenceFile()); + ChronicleMapBuilder.of(ArrayList.class, CharSequence.class).file(getPersistenceFile()); + return ChronicleMapBuilder.of(ArrayList.class, CharSequence.class).create(); } static ChronicleMap newShmStringString(int size) throws IOException { + ChronicleMapBuilder.of(CharSequence.class, CharSequence.class) + + .entries(size).file(getPersistenceFile()); return ChronicleMapBuilder.of(CharSequence.class, CharSequence.class) - .entries(size).create(getPersistenceFile()); + .entries(size).create(); } static ChronicleMap newShmIntString() throws IOException { - return ChronicleMapBuilder.of(Integer.class, CharSequence.class) - - .create(getPersistenceFile()); + ChronicleMapBuilder.of(Integer.class, CharSequence.class).file(getPersistenceFile()); + return ChronicleMapBuilder.of(Integer.class, CharSequence.class).create(); } static ChronicleMap newShmBiBoolean() throws IOException { - return ChronicleMapBuilder.of(BI.class, Boolean.class).create(getPersistenceFile()); + ChronicleMapBuilder.of(BI.class, Boolean.class).file(getPersistenceFile()); + return ChronicleMapBuilder.of(BI.class, Boolean.class).create(); } diff --git a/src/test/java/net/openhft/chronicle/map/jrs166/map/MapCheck.java b/src/test/java/net/openhft/chronicle/map/jrs166/map/MapCheck.java index 805a3013a..702b041ab 100644 --- a/src/test/java/net/openhft/chronicle/map/jrs166/map/MapCheck.java +++ b/src/test/java/net/openhft/chronicle/map/jrs166/map/MapCheck.java @@ -123,8 +123,8 @@ public class MapCheck { try { // return new ConcurrentHashMap(); - return ChronicleMapBuilder.of(Object.class, Object.class) - .create(getPersistenceFile()); + ChronicleMapBuilder.of(Object.class, Object.class).file(getPersistenceFile()); + return ChronicleMapBuilder.of(Object.class, Object.class).create(); } catch (Exception e) { throw new RuntimeException("Can't instantiate CHM : " + e); diff --git a/src/test/java/net/openhft/chronicle/map/utility/ProcessInstanceLimiter.java b/src/test/java/net/openhft/chronicle/map/utility/ProcessInstanceLimiter.java index 7053d4492..80ce0fcca 100644 --- a/src/test/java/net/openhft/chronicle/map/utility/ProcessInstanceLimiter.java +++ b/src/test/java/net/openhft/chronicle/map/utility/ProcessInstanceLimiter.java @@ -136,7 +136,8 @@ public class ProcessInstanceLimiter implements Runnable { ChronicleMapBuilder.of(String.class, Data.class); builder.entries(1000); builder.entrySize(1024); - this.theSharedMap = builder.create(new File(sharedMapPath)); + builder.file(new File(sharedMapPath)); + this.theSharedMap = builder.create(); Thread t = new Thread(this, "ProcessInstanceLimiter updater"); t.setDaemon(true); t.start(); diff --git a/src/test/java/net/openhft/chronicle/set/SetForTCPSocketReplicationTest3way.java b/src/test/java/net/openhft/chronicle/set/SetForTCPSocketReplicationTest3way.java index 057f70161..b78669206 100644 --- a/src/test/java/net/openhft/chronicle/set/SetForTCPSocketReplicationTest3way.java +++ b/src/test/java/net/openhft/chronicle/set/SetForTCPSocketReplicationTest3way.java @@ -49,8 +49,10 @@ public class SetForTCPSocketReplicationTest3way { final int serverPort, final InetSocketAddress... endpoints) throws IOException { return (T) ChronicleSetBuilder.of(Integer.class) - .replicators(identifier, of(serverPort, endpoints). - heartBeatInterval(1L, SECONDS)).create(getPersistenceFile()); + .file(getPersistenceFile()) + .replicators(identifier, of(serverPort, endpoints) + .heartBeatInterval(1L, SECONDS)) + .create(); }