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

HCOLL-163 kept the use of tcp() and udp() internal

Browse Source
This commit is contained in:
Rob Austin
2014-10-14 10:41:36 +01:00
parent 964c64d3e3
commit 1014834668
22 changed files with 97 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/java/net/openhft/chronicle/map/Builder.java
+2 -3
View File
@@ -23,7 +23,6 @@ import java.io.RandomAccessFile;
import java.net.InetSocketAddress;
import static java.util.concurrent.TimeUnit.SECONDS;
import static net.openhft.chronicle.map.Replicators.tcp;
/**
* @author Rob Austin.
@@ -69,11 +68,11 @@ public class Builder {
final byte identifier,
final int serverPort,
final InetSocketAddress... endpoints) throws IOException {
TcpReplicationConfig tcpConfig = TcpReplicationConfig.of(serverPort, endpoints)
TcpReplicationReplicatorConfig tcpConfig = TcpReplicationReplicatorConfig.of(serverPort, endpoints)
.heartBeatInterval(1L, SECONDS);
return ChronicleMapBuilder.of(kClass, vClass)
.entries(20000L)
.replicators(identifier, tcp( tcpConfig));
.replicators(identifier, tcpConfig);
}
src/test/java/net/openhft/chronicle/map/ChannelReplicationTest.java
+3 -3
View File
@@ -51,7 +51,7 @@ public class ChannelReplicationTest {
public void setup() throws IOException {
{
TcpReplicationConfig tcpConfig = TcpReplicationConfig
TcpReplicationReplicatorConfig tcpConfig = TcpReplicationReplicatorConfig
.of(8086, new InetSocketAddress("localhost", 8087))
.heartBeatInterval(1, SECONDS);
@@ -66,8 +66,8 @@ public class ChannelReplicationTest {
}
{
TcpReplicationConfig tcpConfig =
TcpReplicationConfig.of(8087).heartBeatInterval(1, SECONDS);
TcpReplicationReplicatorConfig tcpConfig =
TcpReplicationReplicatorConfig.of(8087).heartBeatInterval(1, SECONDS);
channelProviderB = new ChannelProviderBuilder().replicators((byte) 2, tcpConfig)
.create();
src/test/java/net/openhft/chronicle/map/PostChannelCreationTest.java
+2 -2
View File
@@ -59,7 +59,7 @@ public class PostChannelCreationTest {
public void setup() throws IOException {
{
final TcpReplicationConfig tcpConfig = TcpReplicationConfig
final TcpReplicationReplicatorConfig tcpConfig = TcpReplicationReplicatorConfig
.of(8086, new InetSocketAddress("localhost", 8087))
.heartBeatInterval(1, SECONDS);
@@ -80,7 +80,7 @@ public class PostChannelCreationTest {
{
final TcpReplicationConfig tcpConfig = TcpReplicationConfig
final TcpReplicationReplicatorConfig tcpConfig = TcpReplicationReplicatorConfig
.of(8087, new InetSocketAddress("localhost", 8086))
.heartBeatInterval(1, SECONDS);
src/test/java/net/openhft/chronicle/map/SingleMapClusterTest.java
+6 -4
View File
@@ -56,12 +56,14 @@ public class SingleMapClusterTest {
public void setup() throws IOException {
{
final TcpReplicationConfig tcpReplicationConfig = TcpReplicationConfig
final TcpReplicationReplicatorConfig tcpReplicationConfig = TcpReplicationReplicatorConfig
.of(8086, new InetSocketAddress("localhost", 8087))
.heartBeatInterval(1, SECONDS);
int maxEntrySize = 1024;
byte identifier= 1;
channelProviderA = new ChannelProviderBuilder()
.replicators((byte) 1, tcpReplicationConfig).create();
.maxEntrySize(maxEntrySize)
.replicators(identifier, tcpReplicationConfig).create();
// this is how you add maps after the custer is created
map1a = ChronicleMapBuilder.of(Integer.class, CharSequence.class)
.entries(1000)
@@ -71,7 +73,7 @@ public class SingleMapClusterTest {
{
final TcpReplicationConfig tcpReplicationConfig = TcpReplicationConfig
final TcpReplicationReplicatorConfig tcpReplicationConfig = TcpReplicationReplicatorConfig
.of(8087, new InetSocketAddress("localhost", 8086))
.heartBeatInterval(1, SECONDS);
src/test/java/net/openhft/chronicle/map/TCPSocketReplicationTest3wayPutReturnsNull.java
+2 -2
View File
@@ -44,12 +44,12 @@ public class TCPSocketReplicationTest3wayPutReturnsNull {
final byte identifier,
final int serverPort,
final InetSocketAddress... endpoints) throws IOException {
TcpReplicationConfig tcpConfig = TcpReplicationConfig.of(serverPort, endpoints);
TcpReplicationReplicatorConfig tcpConfig = TcpReplicationReplicatorConfig.of(serverPort, endpoints);
return (T) ChronicleMapBuilder.of(Integer.class, CharSequence.class)
.entries(1000)
.putReturnsNull(true)
.replicators(identifier, Replicators.tcp(tcpConfig))
.replicators(identifier, tcpConfig)
.create(Builder.getPersistenceFile());
}
src/test/java/net/openhft/chronicle/map/TwoMapOnDifferentServers.java
+6 -7
View File
@@ -27,7 +27,7 @@ import java.net.InetSocketAddress;
import static java.util.concurrent.TimeUnit.SECONDS;
import static net.openhft.chronicle.map.Builder.getPersistenceFile;
import static net.openhft.chronicle.map.Replicators.tcp;
import static net.openhft.chronicle.map.TcpReplicationReplicatorConfig.of;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
@@ -43,21 +43,20 @@ public class TwoMapOnDifferentServers {
@Before
public void setup() throws IOException {
final TcpReplicationConfig tcpReplicationConfig = TcpReplicationConfig
.of(8076, new InetSocketAddress("localhost", 8077))
.heartBeatInterval(1, SECONDS);
final TcpReplicationReplicatorConfig tcpConfig =
of(8076, new InetSocketAddress("localhost", 8077))
.heartBeatInterval(1, SECONDS);
File persistenceFile = getPersistenceFile();
map1 = ChronicleMapBuilder.of(Integer.class, CharSequence.class)
.entries(20000)
.replicators((byte) 1, tcp(tcpReplicationConfig))
.replicators((byte) 1, tcpConfig)
.create(persistenceFile);
map2 = ChronicleMapBuilder.of(Integer.class, CharSequence.class)
.entries(20000)
.replicators((byte) 2, tcp(
TcpReplicationConfig.of(8077).heartBeatInterval(1, SECONDS)))
.replicators((byte) 2, of(8077).heartBeatInterval(1, SECONDS))
.create(persistenceFile);
}
src/test/java/net/openhft/chronicle/map/UDPSocketReplicationTest.java
+2 -4
View File
@@ -23,8 +23,6 @@ import java.io.Closeable;
import java.io.IOException;
import java.net.Inet4Address;
import static net.openhft.chronicle.map.Replicators.udp;
/**
* Test ReplicatedChronicleMap where the Replicated is over a TCP Socket
*
@@ -39,12 +37,12 @@ public class UDPSocketReplicationTest {
final int identifier,
final int udpPort) throws IOException {
UdpReplicationConfig udpConfig = UdpReplicationConfig
UdpReplicationReplicatorConfig udpConfig = UdpReplicationReplicatorConfig
.simple(Inet4Address.getByName("255.255.255.255"), udpPort);
return ChronicleMapBuilder.of(Integer.class, CharSequence.class)
.entries(1000)
.replicators((byte) identifier, udp(udpConfig))
.replicators((byte) identifier, udpConfig)
.create(Builder.getPersistenceFile());
}
src/test/java/net/openhft/chronicle/set/SetForTCPSocketReplicationTest3way.java
+3 -4
View File
@@ -27,8 +27,7 @@ import java.net.InetSocketAddress;
import static java.util.concurrent.TimeUnit.SECONDS;
import static net.openhft.chronicle.map.Builder.getPersistenceFile;
import static net.openhft.chronicle.map.Replicators.tcp;
import static net.openhft.chronicle.map.TcpReplicationConfig.of;
import static net.openhft.chronicle.map.TcpReplicationReplicatorConfig.of;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
@@ -51,8 +50,8 @@ public class SetForTCPSocketReplicationTest3way {
final int serverPort,
final InetSocketAddress... endpoints) throws IOException {
return (T) ChronicleSetBuilder.of(Integer.class)
.replicators(identifier, tcp(of(serverPort, endpoints).
heartBeatInterval(1L, SECONDS))).create(getPersistenceFile());
.replicators(identifier, of(serverPort, endpoints).
heartBeatInterval(1L, SECONDS)).create(getPersistenceFile());
}