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

Moved name() from TcpTransportAndNetworkConfig to AbstractReplication

Browse Source
This commit is contained in:
leventov
2015-02-03 22:37:41 +07:00
parent 8ed1c8d2af
commit 5fe9e686d2
12 changed files with 126 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/java/net/openhft/chronicle/map/CHMUseCasesTest.java
+13 -6
View File
@@ -2,6 +2,7 @@ package net.openhft.chronicle.map;
import com.google.common.primitives.Chars;
import net.openhft.chronicle.hash.function.Function;
import net.openhft.chronicle.hash.replication.SingleChronicleHashReplication;
import net.openhft.chronicle.hash.replication.TcpTransportAndNetworkConfig;
import net.openhft.chronicle.map.fromdocs.BondVOInterface;
import net.openhft.lang.io.ByteBufferBytes;
@@ -248,13 +249,15 @@ public class CHMUseCasesTest {
map2 = null;
{
final TcpTransportAndNetworkConfig tcpConfig1 = TcpTransportAndNetworkConfig
.of(8086).name("server")
.of(8086)
.heartBeatInterval(1, TimeUnit.SECONDS)
.tcpBufferSize(1024 * 64);
map2 = builder
.replication((byte) 1, tcpConfig1)
.replication(SingleChronicleHashReplication.builder()
.tcpTransportAndNetwork(tcpConfig1).name("server")
.createWithId((byte) 1))
.instance()
.name("server")
.create();
@@ -263,12 +266,14 @@ public class CHMUseCasesTest {
}
{
final TcpTransportAndNetworkConfig tcpConfig2 = TcpTransportAndNetworkConfig.of
(8087, new InetSocketAddress("localhost", 8086)).name("map2")
(8087, new InetSocketAddress("localhost", 8086))
.heartBeatInterval(1, TimeUnit.SECONDS)
.tcpBufferSize(1024 * 64);
map1 = builder
.replication((byte) 2, tcpConfig2)
.replication(SingleChronicleHashReplication.builder()
.tcpTransportAndNetwork(tcpConfig2).name("map2")
.createWithId((byte) 2))
.instance()
.name("map2")
.create();
@@ -284,13 +289,15 @@ public class CHMUseCasesTest {
case STATELESS: {
{
final TcpTransportAndNetworkConfig tcpConfig1 = TcpTransportAndNetworkConfig
.of(8086).name("server")
.of(8086)
.heartBeatInterval(1, TimeUnit.SECONDS)
.tcpBufferSize(1024 * 64);
map2 = builder
.replication((byte) 1, tcpConfig1)
.replication(SingleChronicleHashReplication.builder()
.tcpTransportAndNetwork(tcpConfig1).name("server")
.createWithId((byte) 1))
.instance()
.name("server")
.create();
src/test/java/net/openhft/chronicle/map/ChronicleMapTest.java
+6 -3
View File
@@ -20,6 +20,7 @@ package net.openhft.chronicle.map;
import com.google.common.collect.HashBiMap;
import com.google.common.primitives.Ints;
import net.openhft.chronicle.hash.replication.SingleChronicleHashReplication;
import net.openhft.chronicle.hash.replication.TcpTransportAndNetworkConfig;
import net.openhft.lang.model.DataValueClasses;
import net.openhft.lang.model.DataValueGenerator;
@@ -1689,8 +1690,7 @@ public class ChronicleMapTest {
@Test
public void testByteArrayKeySizeBySample() throws IOException {
TcpTransportAndNetworkConfig serverConfig = TcpTransportAndNetworkConfig.of(8877)
.name("serverMap");
TcpTransportAndNetworkConfig serverConfig = TcpTransportAndNetworkConfig.of(8877);
File mapFile = getPersistenceFile();
@@ -1698,7 +1698,10 @@ public class ChronicleMapTest {
for (int i = 0; i < 2; i++) {
try (ChronicleMap server = ChronicleMapBuilder.of(byte[].class, byte[][].class)
.replication((byte) 1, serverConfig)
.replication(SingleChronicleHashReplication.builder()
.tcpTransportAndNetwork(serverConfig)
.name("serverMap")
.createWithId((byte) 1))
.constantKeySizeBySample(new byte[14])
.createPersistedTo(mapFile)) {
src/test/java/net/openhft/chronicle/map/StatelessClientTest.java
+5 -4
View File
@@ -20,6 +20,7 @@ package net.openhft.chronicle.map;
import junit.framework.Assert;
import net.openhft.chronicle.hash.function.Function;
import net.openhft.chronicle.hash.replication.SingleChronicleHashReplication;
import net.openhft.chronicle.hash.replication.TcpTransportAndNetworkConfig;
import net.openhft.lang.io.ByteBufferBytes;
import net.openhft.lang.io.Bytes;
@@ -751,11 +752,11 @@ public class StatelessClientTest {
@Test
public void testsConstantKeySizeBySampleIsSentFromServer() throws IOException {
TcpTransportAndNetworkConfig serverConfig = TcpTransportAndNetworkConfig.of(8875)
.name("serverMap");
try (ChronicleMap server = ChronicleMapBuilder.of(byte[].class, CharSequence.class)
.replication((byte) 1, serverConfig)
.replication(SingleChronicleHashReplication.builder()
.tcpTransportAndNetwork(TcpTransportAndNetworkConfig.of(8875))
.name("serverMap")
.createWithId((byte) 1))
.constantKeySizeBySample(new byte[14])
.create()) {
src/test/java/net/openhft/chronicle/map/TCPSocketReplicationBootStrapTest.java
+24 -9
View File
@@ -18,6 +18,7 @@
package net.openhft.chronicle.map;
import net.openhft.chronicle.hash.replication.SingleChronicleHashReplication;
import net.openhft.chronicle.hash.replication.TcpTransportAndNetworkConfig;
import org.junit.After;
import org.junit.Before;
@@ -90,22 +91,32 @@ public class TCPSocketReplicationBootStrapTest {
@Test
public void testBootstrapAndHeartbeat() throws IOException, InterruptedException {
TcpTransportAndNetworkConfig map1Config = TcpTransportAndNetworkConfig.of(8068, Arrays.asList(new InetSocketAddress("localhost", 8067)))
.heartBeatInterval(1L, TimeUnit.SECONDS).name("map1").autoReconnectedUponDroppedConnection
(true);
TcpTransportAndNetworkConfig map1Config = TcpTransportAndNetworkConfig
.of(8068, Arrays.asList(new InetSocketAddress("localhost", 8067)))
.heartBeatInterval(1L, TimeUnit.SECONDS)
.autoReconnectedUponDroppedConnection(true);
map1 = (ReplicatedChronicleMap<Integer, ?, ?, CharSequence, ?, ?>) ChronicleMapBuilder.of(Integer.class, CharSequence.class)
.replication((byte) 1, map1Config).create();
map1 = (ReplicatedChronicleMap<Integer, ?, ?, CharSequence, ?, ?>)
ChronicleMapBuilder.of(Integer.class, CharSequence.class)
.replication(SingleChronicleHashReplication.builder()
.tcpTransportAndNetwork(map1Config)
.name("map1")
.createWithId((byte) 1))
.create();
File persistenceFile = getPersistenceFile();
TcpTransportAndNetworkConfig map2Config = TcpTransportAndNetworkConfig.of(8067)
.heartBeatInterval(1L, TimeUnit.SECONDS).name("map2");
.heartBeatInterval(1L, TimeUnit.SECONDS);
final ReplicatedChronicleMap<Integer, ?, ?, CharSequence, ?, ?> map2a =
(ReplicatedChronicleMap<Integer, ?, ?, CharSequence, ?, ?>)
ChronicleMapBuilder.of(Integer.class, CharSequence.class)
.replication((byte) 2, map2Config).createPersistedTo(persistenceFile);
.replication(SingleChronicleHashReplication.builder()
.tcpTransportAndNetwork(map2Config)
.name("map2")
.createWithId((byte) 2))
.createPersistedTo(persistenceFile);
map2a.put(10, "EXAMPLE-10"); // this will be the last time that map1 go an update from map2
@@ -130,9 +141,13 @@ public class TCPSocketReplicationBootStrapTest {
// now restart map2a and doConnect it to map1, map1 should bootstrap the missing entry
TcpTransportAndNetworkConfig tcpConfigNewMap2 = TcpTransportAndNetworkConfig.of(8067)
.heartBeatInterval(1L, TimeUnit.SECONDS).name("newMap2");
.heartBeatInterval(1L, TimeUnit.SECONDS);
map2 = ChronicleMapBuilder.of(Integer.class, CharSequence.class)
.replication((byte) 2, tcpConfigNewMap2).createPersistedTo(persistenceFile);
.replication(SingleChronicleHashReplication.builder()
.tcpTransportAndNetwork(tcpConfigNewMap2)
.name("newMap2")
.createWithId((byte) 2))
.createPersistedTo(persistenceFile);
// add data into it
waitTillEqual(5000);
src/test/java/net/openhft/chronicle/map/TcpReplicationLargeEntryTest.java
+11 -4
View File
@@ -1,5 +1,6 @@
package net.openhft.chronicle.map;
import net.openhft.chronicle.hash.replication.SingleChronicleHashReplication;
import net.openhft.chronicle.hash.replication.TcpTransportAndNetworkConfig;
import net.openhft.lang.MemoryUnit;
import org.junit.After;
@@ -40,7 +41,7 @@ public class TcpReplicationLargeEntryTest {
{
final TcpTransportAndNetworkConfig tcpConfig1 = TcpTransportAndNetworkConfig.of(s_port,
endpoint).autoReconnectedUponDroppedConnection(true).name(" map1")
endpoint).autoReconnectedUponDroppedConnection(true)
.heartBeatInterval(1, TimeUnit.SECONDS)
.tcpBufferSize(1024 * 64);
@@ -49,21 +50,27 @@ public class TcpReplicationLargeEntryTest {
.constantValueSizeBySample(sampleValue)
.entries(2)
.actualSegments(1)
.replication((byte) 1, tcpConfig1)
.replication(SingleChronicleHashReplication.builder()
.tcpTransportAndNetwork(tcpConfig1)
.name("map1")
.createWithId((byte) 1))
.instance()
.name("map1")
.create();
}
{
final TcpTransportAndNetworkConfig tcpConfig2 = TcpTransportAndNetworkConfig.of
(s_port + 1).autoReconnectedUponDroppedConnection(true).name("map2")
(s_port + 1).autoReconnectedUponDroppedConnection(true)
.heartBeatInterval(1, TimeUnit.SECONDS)
.tcpBufferSize(1024 * 64);
map2 = ChronicleMapBuilder.of(Integer.class, CharSequence.class)
.constantValueSizeBySample(sampleValue)
.entries(2)
.replication((byte) 2, tcpConfig2)
.replication(SingleChronicleHashReplication.builder()
.tcpTransportAndNetwork(tcpConfig2)
.name("map2")
.createWithId((byte) 2))
.instance()
.name("map2")
.create();
src/test/java/net/openhft/chronicle/map/TcpReplicationSoakTest.java
+11 -4
View File
@@ -1,5 +1,6 @@
package net.openhft.chronicle.map;
import net.openhft.chronicle.hash.replication.SingleChronicleHashReplication;
import net.openhft.chronicle.hash.replication.TcpTransportAndNetworkConfig;
import net.openhft.lang.io.ByteBufferBytes;
import net.openhft.lang.model.Byteable;
@@ -38,7 +39,7 @@ public class TcpReplicationSoakTest {
{
final TcpTransportAndNetworkConfig tcpConfig1 = TcpTransportAndNetworkConfig.of(s_port,
endpoint).autoReconnectedUponDroppedConnection(true).name(" map1")
endpoint).autoReconnectedUponDroppedConnection(true)
.heartBeatInterval(1, TimeUnit.SECONDS)
.tcpBufferSize(1024 * 64);
@@ -46,20 +47,26 @@ public class TcpReplicationSoakTest {
map1 = ChronicleMapBuilder.of(Integer.class, CharSequence.class)
.entries(Builder.SIZE + Builder.SIZE)
.actualSegments(1)
.replication((byte) 1, tcpConfig1)
.replication(SingleChronicleHashReplication.builder()
.tcpTransportAndNetwork(tcpConfig1)
.name("map1")
.createWithId((byte) 1))
.instance()
.name("map1")
.create();
}
{
final TcpTransportAndNetworkConfig tcpConfig2 = TcpTransportAndNetworkConfig.of
(s_port + 1).autoReconnectedUponDroppedConnection(true).name("map2")
(s_port + 1).autoReconnectedUponDroppedConnection(true)
.heartBeatInterval(1, TimeUnit.SECONDS)
.tcpBufferSize(1024 * 64);
map2 = ChronicleMapBuilder.of(Integer.class, CharSequence.class)
.entries(Builder.SIZE + Builder.SIZE)
.replication((byte) 2, tcpConfig2)
.replication(SingleChronicleHashReplication.builder()
.tcpTransportAndNetwork(tcpConfig2)
.name("map2")
.createWithId((byte) 2))
.instance()
.name("map2")
.create();