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

CE-20 refactors

Browse Source
This commit is contained in:
Rob Austin
2015-04-07 17:25:41 +01:00
parent ffc2d6bdc1
commit 6ffcdd4501
4 changed files with 53 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/net/openhft/chronicle/map/ClientWiredChronicleMapStatelessBuilder.java
+1 -1
View File
@@ -129,7 +129,7 @@ public final class ClientWiredChronicleMapStatelessBuilder<K, V> implements
// todo clean this up
if (hub == null)
hub = new ClientWiredStatelessTcpConnectionHub(this, localIdentifier, doHandShaking);
hub = new ClientWiredStatelessTcpConnectionHub(this, localIdentifier, doHandShaking, "MAP");
if (!used.getAndSet(true)) {
return new ClientWiredStatelessChronicleMap<K, V>(
src/main/java/net/openhft/chronicle/map/ClientWiredStatelessChronicleMap.java
+19 -10
View File
@@ -64,12 +64,14 @@ class ClientWiredStatelessChronicleMap<K, V>
// used with toString()
private static final int MAX_NUM_ENTRIES = 20;
private String csp;
public ClientWiredStatelessChronicleMap(
@NotNull final ClientWiredChronicleMapStatelessBuilder config,
@NotNull final Class kClass, @NotNull final Class vClass, short channelID) {
this.channelID = channelID;
hub = config.hub;
this.csp = "//server/path/" + channelID + "#MAP";
this.hub = config.hub;
this.putReturnsNull = config.putReturnsNull();
this.removeReturnsNull = config.removeReturnsNull();
this.kClass = kClass;
@@ -121,7 +123,7 @@ class ClientWiredStatelessChronicleMap<K, V>
public String serverApplicationVersion() {
return hub.serverApplicationVersion(channelID);
return hub.serverApplicationVersion(csp);
}
@Override
@@ -219,7 +221,8 @@ class ClientWiredStatelessChronicleMap<K, V>
@NotNull
public String serverPersistedDataVersion() {
return hub.proxyReturnString(persistedDataVersion, channelID);
return hub.proxyReturnString(persistedDataVersion, csp);
}
public boolean isEmpty() {
@@ -305,7 +308,7 @@ class ClientWiredStatelessChronicleMap<K, V>
wire.write(Fields.csp).text("MAP");
wire.write(Fields.tid).int64(tid);
wire.write(Fields.channelId).int16(channelID);
// wire.write(Fields.channelId).int16(channelID);
hub.outWire().writeEventName(putAll);
@@ -715,11 +718,12 @@ class ClientWiredStatelessChronicleMap<K, V>
@SuppressWarnings("SameParameterValue")
private boolean proxyReturnBooleanV(@NotNull final EventId eventId, V value) {
final long startTime = System.currentTimeMillis();
return readBoolean(sendEvent(startTime, eventId, out -> writeField(out, value)), startTime);
return readBoolean(sendEvent(startTime, eventId, out -> writeField(out, value)),
startTime);
}
@SuppressWarnings("SameParameterValue")
private boolean proxyReturnBooleanK(@NotNull final EventId eventId, K key) {
private boolean proxyReturnBooleanK(@NotNull final EventId eventId, K key ) {
final long startTime = System.currentTimeMillis();
return readBoolean(sendEvent(startTime, eventId, out -> writeField(out, key)), startTime);
}
@@ -733,7 +737,8 @@ class ClientWiredStatelessChronicleMap<K, V>
@SuppressWarnings("SameParameterValue")
private void proxyReturnVoid(@NotNull final EventId eventId, Consumer<ValueOut> consumer) {
private void proxyReturnVoid(@NotNull final EventId eventId,
@Nullable final Consumer<ValueOut> consumer) {
final long startTime = System.currentTimeMillis();
long tid = sendEvent(startTime, eventId, consumer);
readVoid(tid, startTime);
@@ -753,7 +758,7 @@ class ClientWiredStatelessChronicleMap<K, V>
hub.outBytesLock().lock();
try {
tid = hub.writeHeader(startTime, channelID, hub.outWire());
tid = writeHeader(startTime);
hub.outWire().writeDocument(false, wireOut -> {
final ValueOut valueOut = wireOut.writeEventName(eventId);
@@ -773,6 +778,10 @@ class ClientWiredStatelessChronicleMap<K, V>
return tid;
}
private long writeHeader(long startTime) {
return hub.writeHeader(startTime, hub.outWire(), csp);
}
@SuppressWarnings("SameParameterValue")
private boolean proxyReturnBoolean(@NotNull final EventId eventId) {
final long startTime = System.currentTimeMillis();
@@ -855,7 +864,7 @@ class ClientWiredStatelessChronicleMap<K, V>
long tid;
hub.outBytesLock().lock();
try {
tid = hub.writeHeader(startTime, channelID, hub.outWire());
tid = writeHeader(startTime);
hub.outWire().writeDocument(false, wireOut -> wireOut.writeEventName(methodName));
hub.writeSocket(hub.outWire());
} finally {
@@ -868,7 +877,7 @@ class ClientWiredStatelessChronicleMap<K, V>
long tid;
hub.outBytesLock().lock();
try {
tid = hub.writeHeader(startTime, channelID, hub.outWire());
tid = writeHeader(startTime);
hub.outWire().write(Fields.eventName).text(methodName.toString());
hub.outWire().writeDocument(false, wireOut -> {
src/main/java/net/openhft/chronicle/map/ClientWiredStatelessTcpConnectionHub.java
+20 -21
View File
@@ -42,7 +42,7 @@ import java.util.concurrent.locks.ReentrantLock;
import static net.openhft.chronicle.map.MapWireHandler.EventId.getApplicationVersion;
import static net.openhft.chronicle.map.MapWireHandler.SIZE_OF_SIZE;
import static net.openhft.chronicle.map.MapWireHandlerBuilder.Fields.*;
import static net.openhft.chronicle.map.MapWireHandlerBuilder.Fields.reply;
/**
* Created by Rob Austin
@@ -57,7 +57,7 @@ public class ClientWiredStatelessTcpConnectionHub {
protected final int tcpBufferSize;
private final ReentrantLock inBytesLock = new ReentrantLock(true);
private final ReentrantLock outBytesLock = new ReentrantLock();
private String type;
@NotNull
private final AtomicLong transactionID = new AtomicLong(0);
@@ -88,7 +88,7 @@ public class ClientWiredStatelessTcpConnectionHub {
public ClientWiredStatelessTcpConnectionHub(
ClientWiredChronicleMapStatelessBuilder config, byte localIdentifier,
boolean doHandShaking) {
boolean doHandShaking, String cspType) {
this.localIdentifier = localIdentifier;
this.doHandShaking = doHandShaking;
this.remoteAddress = config.remoteAddress();
@@ -96,8 +96,9 @@ public class ClientWiredStatelessTcpConnectionHub {
this.config = config;
this.name = config.name();
this.timeoutMs = config.timeoutMs();
this.type = cspType;
attemptConnect(remoteAddress);
checkVersion(config.channelID());
}
private synchronized void attemptConnect(final InetSocketAddress remoteAddress) {
@@ -127,9 +128,9 @@ public class ClientWiredStatelessTcpConnectionHub {
return outBytesLock;
}
protected void checkVersion(short channelID) {
protected void checkVersion(@NotNull String csp) {
final String serverVersion = serverApplicationVersion(channelID);
final String serverVersion = serverApplicationVersion(csp);
final String clientVersion = clientVersion();
if (!serverVersion.equals(clientVersion)) {
@@ -137,7 +138,7 @@ public class ClientWiredStatelessTcpConnectionHub {
"Stateless-Client are on different " +
"versions, " +
" we suggest that you use the same version, server=" +
serverApplicationVersion(channelID) + ", " +
serverApplicationVersion(csp) + ", " +
"client=" + clientVersion);
}
}
@@ -192,7 +193,7 @@ public class ClientWiredStatelessTcpConnectionHub {
}
clientChannel = result;
checkVersion(config.channelID());
checkVersion("//#" + type);
}
@@ -238,9 +239,9 @@ public class ClientWiredStatelessTcpConnectionHub {
}
@NotNull
public String serverApplicationVersion(short channelID) {
public String serverApplicationVersion(@NotNull String csp) {
TextWire wire = new TextWire(Bytes.elasticByteBuffer());
String result = proxyReturnString(getApplicationVersion, channelID, wire);
String result = proxyReturnString(getApplicationVersion, wire, csp);
return (result == null) ? "" : result;
}
@@ -614,8 +615,8 @@ public class ClientWiredStatelessTcpConnectionHub {
private long proxySend(@NotNull final EventId methodName,
final long startTime,
short channelID,
@NotNull final Wire wire) {
@NotNull final Wire wire,
@NotNull final String csp) {
assert outBytesLock().isHeldByCurrentThread();
assert !inBytesLock().isHeldByCurrentThread();
@@ -623,7 +624,7 @@ public class ClientWiredStatelessTcpConnectionHub {
// send
outBytesLock().lock();
try {
long tid = writeHeader(startTime, channelID, wire);
long tid = writeHeader(startTime, wire, csp);
wire.writeDocument(false, wireOut -> {
wireOut.writeEventName(methodName);
wireOut.writeValue().marshallable(w -> {
@@ -639,19 +640,19 @@ public class ClientWiredStatelessTcpConnectionHub {
@SuppressWarnings("SameParameterValue")
@Nullable
String proxyReturnString(@NotNull final EventId messageId, short channelID) {
return proxyReturnString(messageId, channelID, outWire);
String proxyReturnString(@NotNull final EventId messageId, String csp) {
return proxyReturnString(messageId, outWire, csp);
}
@SuppressWarnings("SameParameterValue")
@Nullable
String proxyReturnString(@NotNull final EventId eventId, short channelID, Wire outWire) {
String proxyReturnString(@NotNull final EventId eventId, Wire outWire, String csp) {
final long startTime = System.currentTimeMillis();
long tid;
outBytesLock().lock();
try {
tid = proxySend(eventId, startTime, channelID, outWire);
tid = proxySend(eventId, startTime, outWire, csp);
} finally {
outBytesLock().unlock();
}
@@ -682,7 +683,7 @@ public class ClientWiredStatelessTcpConnectionHub {
return outWire;
}
long writeHeader(long startTime, short channelID, Wire wire) {
long writeHeader(long startTime, Wire wire, String csp) {
assert outBytesLock().isHeldByCurrentThread();
markSize(wire);
@@ -690,10 +691,8 @@ public class ClientWiredStatelessTcpConnectionHub {
long tid = nextUniqueTransaction(startTime);
wire.writeDocument(true, wireOut -> {
wireOut.write(csp).text("MAP");
wireOut.write(MapWireHandlerBuilder.Fields.csp).text(csp);
wireOut.write(MapWireHandlerBuilder.Fields.tid).int64(tid);
// wireOut.write(timeStamp).int64(startTime);
wireOut.write(channelId).int16(channelID);
});
return tid;
src/main/java/net/openhft/chronicle/map/MapWireHandler.java
+13 -1
View File
@@ -196,15 +196,27 @@ class MapWireHandler<K, V> implements WireHandler, Consumer<WireHandlers> {
}
}
StringBuilder cspText = new StringBuilder();
@SuppressWarnings("UnusedReturnValue")
void onEvent() throws StreamCorruptedException {
// it is assumed by this point that the buffer has all the bytes in it for this message
inWire.read(csp).text(cspText);
final int i = cspText.lastIndexOf("/");
if (i != -1 && i < (cspText.length() - 1)) {
final String channelStr = cspText.substring(i + 1, cspText.length() - "#MAP".length());
channelId = Short.parseShort(channelStr);
} else
channelId = 0;
final long tid = inWire.read(Fields.tid).int64();
channelId = inWire.read(Fields.channelId).int16();
final Bytes<?> bytes1 = inWire.bytes();