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

Update lang to the latest version

Browse Source
This commit is contained in:
Peter Lawrey
2014-12-10 11:46:34 +00:00
parent e14461249d
commit f6ebed3c7c
6 changed files with 52 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/net/openhft/chronicle/map/AbstractChronicleMapBuilder.java
+14
View File
@@ -143,6 +143,8 @@ abstract class AbstractChronicleMapBuilder<K, V,
private SingleChronicleHashReplication singleHashReplication = null;
private InetSocketAddress[] pushToAddresses;
public boolean bootstrapOnlyLocalEntries = false;
private boolean checkSerializedValues = false;
private boolean disableOversizedEntries = false;
AbstractChronicleMapBuilder(Class<K> keyClass, Class<V> valueClass) {
keyBuilder = new SerializationBuilder<K>(keyClass, SerializationBuilder.Role.KEY);
@@ -1003,5 +1005,17 @@ abstract class AbstractChronicleMapBuilder<K, V,
public String name() {
return this.name;
}
@Override
public ChronicleMapBuilderI<K, V> checkSerializedValues() {
this.checkSerializedValues = true;
return this;
}
@Override
public ChronicleMapBuilderI<K, V> disableOversizedEntries() {
this.disableOversizedEntries = true;
return this;
}
}
src/main/java/net/openhft/chronicle/map/ChronicleMapBuilder.java
+3 -4
View File
@@ -541,13 +541,12 @@ public final class ChronicleMapBuilder<K, V> implements ChronicleMapBuilderI<K,
}
public ChronicleMapBuilderI<K, V> checkSerializedValues() {
// throw new UnsupportedOperationException("Not implemented");
delegate.checkSerializedValues();
return this;
}
public ChronicleMapBuilder<K, V> disableOversizedEntries(boolean disableOversizedEntries) {
// throw an exception rather than use oversized entries to test the size is as expected.
// throw new UnsupportedOperationException("Not implemented");
public ChronicleMapBuilder<K, V> disableOversizedEntries() {
delegate.disableOversizedEntries();
return this;
}
}
src/main/java/net/openhft/chronicle/map/ChronicleMapBuilderI.java
+3
View File
@@ -315,4 +315,7 @@ public interface ChronicleMapBuilderI<K, V> extends Serializable {
String name();
ChronicleMapBuilderI<K, V> checkSerializedValues();
ChronicleMapBuilderI<K, V> disableOversizedEntries();
}
src/main/java/net/openhft/chronicle/map/StatelessChronicleMap.java
+15 -12
View File
@@ -68,8 +68,8 @@ class StatelessChronicleMap<K, V> implements ChronicleMap<K, V>, Closeable, Clon
private volatile ByteBuffer outBuffer;
private volatile ByteBufferBytes outBytes;
private ByteBuffer inBuffer;
private ByteBufferBytes inBytes;
private volatile ByteBuffer inBuffer;
private volatile ByteBufferBytes inBytes;
@NotNull
private final ReaderWithSize<K> keyReaderWithSize;
@@ -331,13 +331,14 @@ class StatelessChronicleMap<K, V> implements ChronicleMap<K, V>, Closeable, Clon
* @return a unique transactionId
*/
private long nextUniqueTransaction(long time) {
long old = transactionID.getAndSet(time);
if (old == time)
return transactionID.incrementAndGet();
else
return time;
long id = time * 1000;
for (; ; ) {
long old = transactionID.get();
if (old > id) id = old + 1;
if (transactionID.compareAndSet(old, id))
break;
}
return id;
}
@SuppressWarnings("NullableProblems")
@@ -997,13 +998,15 @@ class StatelessChronicleMap<K, V> implements ChronicleMap<K, V>, Closeable, Clon
receive(SIZE_OF_SIZE + SIZE_OF_TRANSACTION_ID, timeoutTime);
final int messageSize = inBytes.readInt();
assert messageSize > 0 : "Invalid message size " + messageSize;
assert messageSize < 16 << 20 : "Invalid message size " + messageSize;
final int remainingBytes0 = messageSize - (SIZE_OF_SIZE + SIZE_OF_TRANSACTION_ID);
final long transactionId0 = inBytes.readLong();
assert transactionId0 != 0;
// check the transaction id is reasonable
assert String.valueOf(transactionId0).startsWith("14");
assert transactionId0 > 1410000000000000L : "TransactionId too small " + transactionId0 + " messageSize " + messageSize;
assert transactionId0 < 2100000000000000L : "TransactionId too large " + transactionId0 + " messageSize " + messageSize;
// if the transaction id is for this thread process it
if (transactionId0 == transactionId) {
src/test/java/net/openhft/chronicle/map/CHMUseCasesTest.java
+16 -16
View File
@@ -246,7 +246,7 @@ public class CHMUseCasesTest {
try (ChronicleMap<Integer, Integer> map = ChronicleMapBuilder
.of(Integer.class, Integer.class)
.entrySize(8)
.disableOversizedEntries(true) // disabled for testing purposes only.
.disableOversizedEntries() // disabled for testing purposes only.
.create()) {
Integer key1;
Integer key2;
@@ -300,7 +300,7 @@ public class CHMUseCasesTest {
try (ChronicleMap<Long, Long> map = ChronicleMapBuilder
.of(Long.class, Long.class)
.entrySize(16)
.disableOversizedEntries(true) // disabled for testing purposes only.
.disableOversizedEntries() // disabled for testing purposes only.
.create()) {
map.put(1L, 11L);
assertEquals((Long) 11L, map.get(1L));
@@ -342,7 +342,7 @@ public class CHMUseCasesTest {
public void testDoubleDoubleMap() throws ExecutionException, InterruptedException {
try (ChronicleMap<Double, Double> map = ChronicleMapBuilder
.of(Double.class, Double.class)
.disableOversizedEntries(true) // disabled for testing purposes only.
.disableOversizedEntries() // disabled for testing purposes only.
.entrySize(16)
.create()) {
map.put(1.0, 11.0);
@@ -386,7 +386,7 @@ public class CHMUseCasesTest {
public void testByteArrayByteArrayMap() throws ExecutionException, InterruptedException {
try (ChronicleMap<byte[], byte[]> map = ChronicleMapBuilder
.of(byte[].class, byte[].class)
.disableOversizedEntries(true) // disabled for testing purposes only.
.disableOversizedEntries() // disabled for testing purposes only.
.entrySize(12)
.create()) {
byte[] key1 = {1, 1, 1, 1};
@@ -436,7 +436,7 @@ public class CHMUseCasesTest {
.of(ByteBuffer.class, ByteBuffer.class)
.valueMarshaller(ByteBufferMarshaller.INSTANCE)
.keyMarshaller(ByteBufferMarshaller.INSTANCE)
.disableOversizedEntries(true) // disabled for testing purposes only.
.disableOversizedEntries() // disabled for testing purposes only.
.entrySize(20)
.create()) {
ByteBuffer key1 = ByteBuffer.wrap(new byte[]{1, 1, 1, 1});
@@ -522,7 +522,7 @@ public class CHMUseCasesTest {
ByteBuffer bb1 = ByteBuffer.allocate(8);
bb1.put(value1);
bb1.putShort((short)12345);
bb1.putShort((short) 12345);
bb1.flip();
assertBBEquals(bb1, valueA);
}
@@ -543,7 +543,7 @@ public class CHMUseCasesTest {
.of(ByteBuffer.class, ByteBuffer.class)
.valueMarshaller(ByteBufferMarshaller.INSTANCE) // we should not have to to this !
.keyMarshaller(ByteBufferMarshaller.INSTANCE) // we should not have to to this !
.disableOversizedEntries(true) // disabled for testing purposes only.
.disableOversizedEntries() // disabled for testing purposes only.
.entrySize(12)
.create()) {
ByteBuffer key1 = ByteBuffer.wrap(new byte[]{1, 1, 1, 1});
@@ -595,7 +595,7 @@ public class CHMUseCasesTest {
public void testIntValueIntValueMap() {
try (ChronicleMap<IntValue, IntValue> map = ChronicleMapBuilder
.of(IntValue.class, IntValue.class)
.disableOversizedEntries(true) // disabled for testing purposes only.
.disableOversizedEntries() // disabled for testing purposes only.
.entrySize(8)
.create()) {
IntValue key1 = ChronicleMapBuilder.newInstance(IntValue.class, false);
@@ -677,7 +677,7 @@ public class CHMUseCasesTest {
public void testUnsignedIntValueUnsignedIntValueMap() {
try (ChronicleMap<UnsignedIntValue, UnsignedIntValue> map = ChronicleMapBuilder
.of(UnsignedIntValue.class, UnsignedIntValue.class)
.disableOversizedEntries(true) // disabled for testing purposes only.
.disableOversizedEntries() // disabled for testing purposes only.
.entrySize(8)
.create()) {
UnsignedIntValue key1 = ChronicleMapBuilder.newInstance(UnsignedIntValue.class, true);
@@ -759,7 +759,7 @@ public class CHMUseCasesTest {
public void testIntValueShortValueMap() {
try (ChronicleMap<IntValue, ShortValue> map = ChronicleMapBuilder
.of(IntValue.class, ShortValue.class)
.disableOversizedEntries(true) // disabled for testing purposes only.
.disableOversizedEntries() // disabled for testing purposes only.
.entrySize(6)
.create()) {
IntValue key1 = ChronicleMapBuilder.newInstance(IntValue.class, false);
@@ -842,7 +842,7 @@ public class CHMUseCasesTest {
try (ChronicleMap<IntValue, UnsignedShortValue> map = ChronicleMapBuilder
.of(IntValue.class, UnsignedShortValue.class)
.entrySize(6)
.disableOversizedEntries(true) // disabled for testing purposes only.
.disableOversizedEntries() // disabled for testing purposes only.
.create()) {
IntValue key1 = ChronicleMapBuilder.newInstance(IntValue.class, false);
IntValue key2 = ChronicleMapBuilder.newInstance(IntValue.class, false);
@@ -923,7 +923,7 @@ public class CHMUseCasesTest {
public void testIntValueCharValueMap() {
try (ChronicleMap<IntValue, CharValue> map = ChronicleMapBuilder
.of(IntValue.class, CharValue.class)
.disableOversizedEntries(true) // disabled for testing purposes only.
.disableOversizedEntries() // disabled for testing purposes only.
.entrySize(6)
.create()) {
IntValue key1 = ChronicleMapBuilder.newInstance(IntValue.class, false);
@@ -1006,7 +1006,7 @@ public class CHMUseCasesTest {
try (ChronicleMap<IntValue, UnsignedByteValue> map = ChronicleMapBuilder
.of(IntValue.class, UnsignedByteValue.class)
.entrySize(5)
.disableOversizedEntries(true) // disabled for testing purposes only.
.disableOversizedEntries() // disabled for testing purposes only.
.create()) {
IntValue key1 = ChronicleMapBuilder.newInstance(IntValue.class, false);
IntValue key2 = ChronicleMapBuilder.newInstance(IntValue.class, false);
@@ -1087,7 +1087,7 @@ public class CHMUseCasesTest {
public void testIntValueBooleanValueMap() {
try (ChronicleMap<IntValue, BooleanValue> map = ChronicleMapBuilder
.of(IntValue.class, BooleanValue.class)
.disableOversizedEntries(true) // disabled for testing purposes only.
.disableOversizedEntries() // disabled for testing purposes only.
.entrySize(5)
.create()) {
IntValue key1 = ChronicleMapBuilder.newInstance(IntValue.class, false);
@@ -1170,7 +1170,7 @@ public class CHMUseCasesTest {
try (ChronicleMap<FloatValue, FloatValue> map = ChronicleMapBuilder
.of(FloatValue.class, FloatValue.class)
.entrySize(8)
.disableOversizedEntries(true) // disabled for testing purposes only.
.disableOversizedEntries() // disabled for testing purposes only.
.create()) {
FloatValue key1 = ChronicleMapBuilder.newInstance(FloatValue.class, false);
FloatValue key2 = ChronicleMapBuilder.newInstance(FloatValue.class, false);
@@ -1337,7 +1337,7 @@ public class CHMUseCasesTest {
try (ChronicleMap<LongValue, LongValue> map = ChronicleMapBuilder
.of(LongValue.class, LongValue.class)
.entrySize(16)
.disableOversizedEntries(true) // disabled for testing purposes only.
.disableOversizedEntries() // disabled for testing purposes only.
.create()) {
LongValue key1 = ChronicleMapBuilder.newInstance(LongValue.class, false);
LongValue key2 = ChronicleMapBuilder.newInstance(LongValue.class, false);
src/test/java/net/openhft/chronicle/map/StatelessClientTest.java
+1 -1
View File
@@ -38,7 +38,7 @@ import static org.junit.Assert.assertTrue;
public class StatelessClientTest {
public static final int SIZE = 2500;
static int s_port = 9050;
static int s_port = 9070;
enum ToString implements Function<Object, String> {
INSTANCE;