mirror of
https://github.com/OpenHFT/Chronicle-Map.git
synced 2021-09-13 01:26:12 +00:00
Hide the remaining parts of the replication API from the public eye
This commit is contained in:
@@ -16,12 +16,11 @@
|
||||
|
||||
package net.openhft.chronicle.map;
|
||||
|
||||
import net.openhft.chronicle.hash.ChronicleHashBuilderPrivateAPI;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
import java.net.InetSocketAddress;
|
||||
import java.util.Map.Entry;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
|
||||
import static net.openhft.chronicle.map.Issue62ChronicleServer.MAP_FILE_B;
|
||||
import static net.openhft.chronicle.map.Issue62ChronicleServer.prepare;
|
||||
@@ -37,9 +36,11 @@ public class Issue62ChronicleClient {
|
||||
ChronicleMapBuilder.of(String.class, Long.class)
|
||||
//.averageKeySize(100)
|
||||
.averageKey(Issue62ChronicleServer.STR)
|
||||
.replication((byte) 2)
|
||||
.entries(50_000);
|
||||
|
||||
((ChronicleHashBuilderPrivateAPI<?, ?>) cityPostalCodesMapBuilder.privateAPI())
|
||||
.replication((byte) 2);
|
||||
|
||||
try (ChronicleMap<String, Long> map =
|
||||
cityPostalCodesMapBuilder.createPersistedTo(MAP_FILE_B)) {
|
||||
|
||||
|
||||
@@ -16,6 +16,7 @@
|
||||
|
||||
package net.openhft.chronicle.map;
|
||||
|
||||
import net.openhft.chronicle.hash.ChronicleHashBuilderPrivateAPI;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
@@ -49,9 +50,11 @@ public class Issue62ChronicleServer {
|
||||
ChronicleMapBuilder.of(String.class, Long.class)
|
||||
//.averageKeySize(100)
|
||||
.averageKey(STR)
|
||||
.replication((byte) 1)
|
||||
.entries(50_000);
|
||||
|
||||
((ChronicleHashBuilderPrivateAPI<?, ?>) cityPostalCodesMapBuilder.privateAPI())
|
||||
.replication((byte) 1);
|
||||
|
||||
ChronicleMap<String, Long> cityPostalCodes =
|
||||
cityPostalCodesMapBuilder.createPersistedTo(MAP_FILE_A);
|
||||
|
||||
|
||||
@@ -16,6 +16,8 @@
|
||||
|
||||
package net.openhft.chronicle.map;
|
||||
|
||||
import net.openhft.chronicle.hash.ChronicleHashBuilder;
|
||||
import net.openhft.chronicle.hash.ChronicleHashBuilderPrivateAPI;
|
||||
import org.junit.Ignore;
|
||||
import org.junit.Test;
|
||||
import org.slf4j.Logger;
|
||||
@@ -44,14 +46,17 @@ public class RecoverTest {
|
||||
File mapFile = File.createTempFile("recoverTestFile", ".map");
|
||||
mapFile.deleteOnExit();
|
||||
|
||||
map = (ReplicatedChronicleMap<Integer, Integer, ?>) ChronicleMap
|
||||
ChronicleMapBuilder<Integer, Integer> builder = ChronicleMap
|
||||
.of(Integer.class, Integer.class)
|
||||
.entries(2)
|
||||
.actualSegments(1)
|
||||
.checksumEntries(true)
|
||||
.replication((byte) 1)
|
||||
.cleanupRemovedEntries(false)
|
||||
.createPersistedTo(mapFile);
|
||||
.checksumEntries(true);
|
||||
ChronicleHashBuilderPrivateAPI<?, ?> privateAPI =
|
||||
(ChronicleHashBuilderPrivateAPI<?, ?>) builder.privateAPI();
|
||||
privateAPI.replication((byte) 1);
|
||||
privateAPI.cleanupRemovedEntries(false);
|
||||
|
||||
map = (ReplicatedChronicleMap<Integer, Integer, ?>) builder.createPersistedTo(mapFile);
|
||||
|
||||
map.acquireModificationIterator((byte) 2);
|
||||
|
||||
@@ -74,14 +79,8 @@ public class RecoverTest {
|
||||
|
||||
map.close();
|
||||
|
||||
map = (ReplicatedChronicleMap<Integer, Integer, ?>) ChronicleMap
|
||||
.of(Integer.class, Integer.class)
|
||||
.entries(2)
|
||||
.actualSegments(1)
|
||||
.checksumEntries(true)
|
||||
.replication((byte) 1)
|
||||
.cleanupRemovedEntries(false)
|
||||
.recoverPersistedTo(mapFile, true);
|
||||
map = (ReplicatedChronicleMap<Integer, Integer, ?>)
|
||||
builder.recoverPersistedTo(mapFile, true);
|
||||
|
||||
// acquires read lock successfully
|
||||
assertNull(map.get(0));
|
||||
@@ -101,11 +100,14 @@ public class RecoverTest {
|
||||
for (int bit = 0; bit < 64; bit++) {
|
||||
LOG.error("flip bit {} of word at {}", bit, offset);
|
||||
mapBB.putLong((int) offset, mapBB.getLong((int) offset) ^ (1L << bit));
|
||||
try (ChronicleMap<Integer, Integer> recovered = ChronicleMap
|
||||
.of(Integer.class, Integer.class)
|
||||
.replication((byte) 1)
|
||||
.cleanupRemovedEntries(false)
|
||||
.recoverPersistedTo(mapFile, false)) {
|
||||
ChronicleMapBuilder<Integer, Integer> recoverBuilder = ChronicleMap
|
||||
.of(Integer.class, Integer.class);
|
||||
ChronicleHashBuilderPrivateAPI<?, ?> recoverPrivateAPI =
|
||||
(ChronicleHashBuilderPrivateAPI<?, ?>) recoverBuilder.privateAPI();
|
||||
recoverPrivateAPI.replication((byte) 1);
|
||||
recoverPrivateAPI.cleanupRemovedEntries(false);
|
||||
try (ChronicleMap<Integer, Integer> recovered =
|
||||
recoverBuilder.recoverPersistedTo(mapFile, false)) {
|
||||
recovered.put(1, 1);
|
||||
recovered.put(2, 2);
|
||||
recovered.remove(1);
|
||||
|
||||
@@ -16,6 +16,7 @@
|
||||
|
||||
package net.openhft.chronicle.map;
|
||||
|
||||
import net.openhft.chronicle.hash.ChronicleHashBuilderPrivateAPI;
|
||||
import net.openhft.chronicle.map.jsr166.JSR166TestCase;
|
||||
import org.junit.Ignore;
|
||||
import org.junit.Test;
|
||||
@@ -34,20 +35,22 @@ import static org.junit.Assert.*;
|
||||
*/
|
||||
public class ReplicatedChronicleMapTest extends JSR166TestCase {
|
||||
ChronicleMap<Integer, CharSequence> newShmIntString() throws IOException {
|
||||
return ChronicleMapBuilder.of(Integer.class, CharSequence.class)
|
||||
.replication((byte) 1)
|
||||
ChronicleMapBuilder<Integer, CharSequence> builder = ChronicleMap
|
||||
.of(Integer.class, CharSequence.class)
|
||||
.entries(1000)
|
||||
.averageValueSize(20)
|
||||
.create();
|
||||
.averageValueSize(20);
|
||||
((ChronicleHashBuilderPrivateAPI<?, ?>) builder.privateAPI()).replication((byte) 1);
|
||||
return builder.create();
|
||||
}
|
||||
|
||||
ChronicleMap<CharSequence, CharSequence> newShmStringString() throws IOException {
|
||||
return ChronicleMapBuilder.of(CharSequence.class, CharSequence.class)
|
||||
.replication((byte) 1)
|
||||
ChronicleMapBuilder<CharSequence, CharSequence> builder = ChronicleMap
|
||||
.of(CharSequence.class, CharSequence.class)
|
||||
.entries(1000)
|
||||
.averageKeySize(20)
|
||||
.averageValueSize(20)
|
||||
.create();
|
||||
.averageValueSize(20);
|
||||
((ChronicleHashBuilderPrivateAPI<?, ?>) builder.privateAPI()).replication((byte) 1);
|
||||
return builder.create();
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user