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 Initial checking of - ( Move the identifier configuration from TCP/UDP Replication, back to the builder.), more on this JIRA coming soon...

Browse Source
This commit is contained in:
Rob Austin
2014-10-13 17:11:47 +01:00
parent 7d1d965b84
commit 77cb5be05c
17 changed files with 244 additions and 285 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/java/net/openhft/chronicle/map/Builder.java
+1 -1
View File
@@ -73,7 +73,7 @@ public class Builder {
.heartBeatInterval(1L, SECONDS);
return ChronicleMapBuilder.of(kClass, vClass)
.entries(20000L)
.addReplicator(tcp(identifier, tcpConfig));
.replicators(identifier, tcp( tcpConfig));
}
src/test/java/net/openhft/chronicle/map/ClusterReplicationTest.java
+4 -4
View File
@@ -57,7 +57,7 @@ public class ClusterReplicationTest {
map1a = ChronicleMapBuilder.of(Integer.class, CharSequence.class)
.entries(1000)
.addReplicator(clusterA.channelReplicator((short) 1))
.channel(clusterA.createChannel((short) 1))
.create(getPersistenceFile());
}
@@ -70,7 +70,7 @@ public class ClusterReplicationTest {
map1b = ChronicleMapBuilder.of(Integer.class, CharSequence.class)
.entries(1000)
.addReplicator(clusterB.channelReplicator((short) 1))
.channel(clusterB.createChannel((short) 1))
.create(getPersistenceFile());
}
}
@@ -93,13 +93,13 @@ public class ClusterReplicationTest {
map2b = ChronicleMapBuilder.of(Integer.class, CharSequence.class)
.entries(1000)
.addReplicator(clusterB.channelReplicator((short) 2))
.channel(clusterB.createChannel((short) 2))
.create(getPersistenceFile());
map2a = ChronicleMapBuilder.of(Integer.class, CharSequence.class)
.entries(1000)
.addReplicator(clusterA.channelReplicator((short) 2))
.channel(clusterA.createChannel((short) 2))
.create(getPersistenceFile());
map2a.put(1, "EXAMPLE-2");
src/test/java/net/openhft/chronicle/map/PostClusterMapCreationTest.java
+8 -5
View File
@@ -17,7 +17,10 @@
package net.openhft.chronicle.map;
import org.junit.*;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import java.io.Closeable;
import java.io.File;
@@ -69,12 +72,12 @@ public class PostClusterMapCreationTest {
// this is how you add maps after the custer is created
map1a = ChronicleMapBuilder.of(Integer.class, CharSequence.class)
.entries(1000)
.addReplicator(clusterA.channelReplicator((short) 1))
.channel(clusterA.createChannel((short) 1))
.create(getPersistenceFile());
map2a = ChronicleMapBuilder.of(Integer.class, CharSequence.class)
.entries(1000)
.addReplicator(clusterA.channelReplicator((short) 2))
.channel(clusterA.createChannel((short) 2))
.create(getPersistenceFile());
}
@@ -90,12 +93,12 @@ public class PostClusterMapCreationTest {
// this is how you add maps after the custer is created
map1b = ChronicleMapBuilder.of(Integer.class, CharSequence.class)
.entries(1000)
.addReplicator(clusterB.channelReplicator((short) 1))
.channel(clusterB.createChannel((short) 1))
.create(getPersistenceFile());
map2b = ChronicleMapBuilder.of(Integer.class, CharSequence.class)
.entries(1000)
.addReplicator(clusterB.channelReplicator((short) 2))
.channel(clusterB.createChannel((short) 2))
.create(getPersistenceFile());
}
src/test/java/net/openhft/chronicle/map/ReplicatedChronicleMapTest.java
+10 -9
View File
@@ -18,8 +18,6 @@ package net.openhft.chronicle.map;
import net.openhft.chronicle.map.jrs166.JSR166TestCase;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import java.io.File;
import java.io.IOException;
@@ -44,48 +42,51 @@ public class ReplicatedChronicleMapTest extends JSR166TestCase {
}
ChronicleMap<Integer, CharSequence> newShmIntString(int size) throws IOException {
ChronicleMapBuilder.of(Integer.class, CharSequence.class)
.entries(size).replicators((byte) 1);
return ChronicleMapBuilder.of(Integer.class, CharSequence.class)
.entries(size)
.forceReplicatedImpl()
.create(getPersistenceFile());
}
ChronicleMap<ArrayList, CharSequence> newShmListBoolean(int size) throws IOException {
ChronicleMapBuilder.of(ArrayList.class, CharSequence.class)
.entries(size).replicators((byte) 1);
return ChronicleMapBuilder.of(ArrayList.class, CharSequence.class)
.entries(size)
.forceReplicatedImpl()
.create(getPersistenceFile());
}
ChronicleMap<ArrayList, CharSequence> newShmListBoolean() throws IOException {
ChronicleMapBuilder.of(ArrayList.class, CharSequence.class).replicators((byte) 1);
return ChronicleMapBuilder.of(ArrayList.class, CharSequence.class)
.forceReplicatedImpl()
.create(getPersistenceFile());
}
ChronicleMap<CharSequence, CharSequence> newShmStringString(int size) throws IOException {
ChronicleMapBuilder.of(CharSequence.class, CharSequence.class)
.entries(size).replicators((byte) 1);
return ChronicleMapBuilder.of(CharSequence.class, CharSequence.class)
.entries(size)
.forceReplicatedImpl()
.create(getPersistenceFile());
}
ChronicleMap<Integer, CharSequence> newShmIntString() throws IOException {
ChronicleMapBuilder.of(Integer.class, CharSequence.class).replicators((byte) 1);
return ChronicleMapBuilder.of(Integer.class, CharSequence.class)
.forceReplicatedImpl()
.create(getPersistenceFile());
}
ChronicleMap<BI, Boolean> newShmBiBoolean() throws IOException {
return ChronicleMapBuilder.of(BI.class, Boolean.class)
.forceReplicatedImpl().create(getPersistenceFile());
ChronicleMapBuilder.of(BI.class, Boolean.class).replicators((byte) 1);
return ChronicleMapBuilder.of(BI.class, Boolean.class).create(getPersistenceFile());
}
src/test/java/net/openhft/chronicle/map/SingleMapClusterTest.java
+2 -2
View File
@@ -66,7 +66,7 @@ public class SingleMapClusterTest {
// this is how you add maps after the custer is created
map1a = ChronicleMapBuilder.of(Integer.class, CharSequence.class)
.entries(1000)
.addReplicator(clusterA.channelReplicator((short) 1))
.channel(clusterA.createChannel((short) 1))
.create(getPersistenceFile());
}
@@ -80,7 +80,7 @@ public class SingleMapClusterTest {
.tcpReplication(tcpReplicationConfig).create();
// this is how you add maps after the custer is created
map1b = ChronicleMapBuilder.of(Integer.class, CharSequence.class)
.addReplicator(clusterB.channelReplicator((short) 1))
.channel(clusterB.createChannel((short) 1))
.entries(1000)
.create(getPersistenceFile());
}
src/test/java/net/openhft/chronicle/map/TCPSocketReplicationTest3wayPutReturnsNull.java
+1 -1
View File
@@ -49,7 +49,7 @@ public class TCPSocketReplicationTest3wayPutReturnsNull {
.entries(1000)
.putReturnsNull(true)
.addReplicator(Replicators.tcp(identifier, tcpConfig))
.replicators(identifier, Replicators.tcp(tcpConfig))
.create(Builder.getPersistenceFile());
}
src/test/java/net/openhft/chronicle/map/TimeBasedReplicationTests.java
+23 -23
View File
@@ -47,9 +47,10 @@ public class TimeBasedReplicationTests extends JSR166TestCase {
final TimeProvider timeProvider = Mockito.mock(TimeProvider.class);
ChronicleMapBuilder.of(CharSequence.class, CharSequence.class)
.entries(10).replicators((byte) 1);
ChronicleMap map = ChronicleMapBuilder.of(CharSequence.class, CharSequence.class)
.entries(10)
.forceReplicatedImpl()
.replicators((byte) 1)
.timeProvider(timeProvider)
.create(getPersistenceFile());
@@ -77,10 +78,10 @@ public class TimeBasedReplicationTests extends JSR166TestCase {
public void testIgnoreALatePutIfAbsent() throws IOException {
final TimeProvider timeProvider = Mockito.mock(TimeProvider.class);
ChronicleMapBuilder.of(CharSequence.class, CharSequence.class)
.entries(10).replicators((byte) 1);
ChronicleMap map = ChronicleMapBuilder.of(CharSequence.class, CharSequence.class)
.entries(10)
.forceReplicatedImpl()
.entries(10)
.replicators((byte) 1)
.timeProvider(timeProvider)
.create(getPersistenceFile());
@@ -109,10 +110,10 @@ public class TimeBasedReplicationTests extends JSR166TestCase {
public void testIgnoreALateReplace() throws IOException {
final TimeProvider timeProvider = Mockito.mock(TimeProvider.class);
ChronicleMapBuilder.of(CharSequence.class, CharSequence.class)
.entries(10).replicators((byte) 1);
ChronicleMap map = ChronicleMapBuilder.of(CharSequence.class, CharSequence.class)
.entries(10)
.forceReplicatedImpl()
.entries(10)
.replicators((byte) 1)
.timeProvider(timeProvider)
.create(getPersistenceFile());
@@ -144,10 +145,10 @@ public class TimeBasedReplicationTests extends JSR166TestCase {
public void testIgnoreALateReplaceWithValue() throws IOException {
final TimeProvider timeProvider = Mockito.mock(TimeProvider.class);
ChronicleMapBuilder.of(CharSequence.class, CharSequence.class)
.entries(10).replicators((byte) 1);
ChronicleMap map = ChronicleMapBuilder.of(CharSequence.class, CharSequence.class)
.entries(10)
.forceReplicatedImpl()
.entries(10)
.replicators((byte) 1)
.timeProvider(timeProvider)
.create(getPersistenceFile());
@@ -176,9 +177,9 @@ public class TimeBasedReplicationTests extends JSR166TestCase {
public void testIgnoreALateRemoveWithValue() throws IOException {
final TimeProvider timeProvider = Mockito.mock(TimeProvider.class);
ChronicleMapBuilder.of(CharSequence.class, CharSequence.class).replicators((byte) 1);
ChronicleMap map = ChronicleMapBuilder.of(CharSequence.class, CharSequence.class)
.forceReplicatedImpl()
.replicators((byte) 1)
.timeProvider(timeProvider)
.create(getPersistenceFile());
@@ -206,9 +207,9 @@ public class TimeBasedReplicationTests extends JSR166TestCase {
public void testIgnoreALateRemove() throws IOException {
final TimeProvider timeProvider = Mockito.mock(TimeProvider.class);
ChronicleMapBuilder.of(CharSequence.class, CharSequence.class).replicators((byte) 1);
ChronicleMap map = ChronicleMapBuilder.of(CharSequence.class, CharSequence.class)
.forceReplicatedImpl()
.replicators((byte) 1)
.timeProvider(timeProvider)
.create(getPersistenceFile());
@@ -236,10 +237,9 @@ public class TimeBasedReplicationTests extends JSR166TestCase {
public void testIgnoreWithRemoteRemove() throws IOException {
final TimeProvider timeProvider = Mockito.mock(TimeProvider.class);
ChronicleMapBuilder.of(CharSequence.class, CharSequence.class).replicators((byte) 1);
ReplicatedChronicleMap map = (ReplicatedChronicleMap) ChronicleMapBuilder.of(CharSequence.class, CharSequence.class)
.forceReplicatedImpl()
.entries(10)
.replicators((byte) 1)
.timeProvider(timeProvider)
.create(getPersistenceFile());
@@ -268,10 +268,9 @@ public class TimeBasedReplicationTests extends JSR166TestCase {
final TimeProvider timeProvider = Mockito.mock(TimeProvider.class);
ChronicleMapBuilder.of(CharSequence.class, CharSequence.class).replicators((byte) 1);
ReplicatedChronicleMap map = (ReplicatedChronicleMap) ChronicleMapBuilder.of(CharSequence.class, CharSequence.class)
.forceReplicatedImpl()
.entries(10)
.replicators((byte) 1)
.timeProvider(timeProvider)
.create(getPersistenceFile());
@@ -302,7 +301,7 @@ public class TimeBasedReplicationTests extends JSR166TestCase {
final TimeProvider timeProvider = Mockito.mock(TimeProvider.class);
ReplicatedChronicleMap map = (ReplicatedChronicleMap) ChronicleMapBuilder.of(CharSequence.class, CharSequence.class)
.entries(10)
.forceReplicatedImpl()
.replicators((byte) 1)
.entries(10)
.timeProvider(timeProvider)
.create(getPersistenceFile());
@@ -330,9 +329,10 @@ public class TimeBasedReplicationTests extends JSR166TestCase {
public void testPutRemovePut() throws IOException {
final TimeProvider timeProvider = Mockito.mock(TimeProvider.class);
ChronicleMapBuilder.of(CharSequence.class, CharSequence.class)
.entries(10).replicators((byte) 1);
ChronicleMap map = ChronicleMapBuilder.of(CharSequence.class, CharSequence.class)
.entries(10)
.forceReplicatedImpl()
.entries(10)
.timeProvider(timeProvider)
.create(getPersistenceFile());
src/test/java/net/openhft/chronicle/map/TwoMapOnDifferentServers.java
+2 -2
View File
@@ -51,12 +51,12 @@ public class TwoMapOnDifferentServers {
File persistenceFile = getPersistenceFile();
map1 = ChronicleMapBuilder.of(Integer.class, CharSequence.class)
.entries(20000)
.addReplicator(tcp((byte) 1, tcpReplicationConfig))
.replicators((byte) 1, tcp(tcpReplicationConfig))
.create(persistenceFile);
map2 = ChronicleMapBuilder.of(Integer.class, CharSequence.class)
.entries(20000)
.addReplicator(tcp((byte) 2,
.replicators((byte) 2, tcp(
TcpReplicationConfig.of(8077).heartBeatInterval(1, SECONDS)))
.create(persistenceFile);
}
src/test/java/net/openhft/chronicle/map/UDPSocketReplicationTest.java
+1 -1
View File
@@ -44,7 +44,7 @@ public class UDPSocketReplicationTest {
return ChronicleMapBuilder.of(Integer.class, CharSequence.class)
.entries(1000)
.addReplicator(udp((byte) identifier, udpConfig))
.replicators((byte) identifier, udp(udpConfig))
.create(Builder.getPersistenceFile());
}
src/test/java/net/openhft/chronicle/set/SetForTCPSocketReplicationTest3way.java
+1 -1
View File
@@ -51,7 +51,7 @@ public class SetForTCPSocketReplicationTest3way {
final int serverPort,
final InetSocketAddress... endpoints) throws IOException {
return (T) ChronicleSetBuilder.of(Integer.class)
.addReplicator(tcp(identifier, of(serverPort, endpoints).
.replicators(identifier, tcp(of(serverPort, endpoints).
heartBeatInterval(1L, SECONDS))).create(getPersistenceFile());
}