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

added some bug fixes around replace() for chronicle map wire

Browse Source
This commit is contained in:
Rob Austin
2015-03-13 10:40:59 +00:00
parent b0ca345be0
commit 58eb16492a
2 changed files with 26 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/net/openhft/chronicle/map/ClientWiredStatelessChronicleMap.java
+4 -2
View File
@@ -460,6 +460,7 @@ class ClientWiredStatelessChronicleMap<K, V> implements ChronicleMap<K, V>, Clon
writeField(fieldName, value, hub.outWire());
}
private void writeField(Fields fieldName, Object value, Wire wire) {
assert hub.outBytesLock().isHeldByCurrentThread();
@@ -632,8 +633,9 @@ class ClientWiredStatelessChronicleMap<K, V> implements ChronicleMap<K, V>, Clon
try {
transactionId = hub.writeHeader(startTime, channelID, hub.outWire());
writeField(Fields.METHOD_NAME, methodName);
writeField(Fields.ARG_1, value1);
writeField(Fields.ARG_2, value2);
writeField(Fields.ARG_1, key);
writeField(Fields.ARG_2, value1);
writeField(Fields.ARG_3, value2);
hub.writeSocket(hub.outWire());
} finally {
hub.outBytesLock().unlock();
src/main/java/net/openhft/chronicle/map/MapWireHandler.java
+22 -5
View File
@@ -240,8 +240,6 @@ class MapWireHandler<K, V> implements WireHandler {
return;
}
if ("CREATE_CHANNEL".contentEquals(methodName)) {
writeVoid(() -> {
short channelId1 = inWire.read(ARG_1).int16();
@@ -304,9 +302,26 @@ class MapWireHandler<K, V> implements WireHandler {
}
if ("REPLACE".contentEquals(methodName)) {
writeValue(bytesMap -> {
final net.openhft.lang.io.Bytes reader = toReader(inWire, ARG_1, ARG_2);
return bytesMap.replace(reader, reader);
write(bytesMap -> {
// todo fix this this is a hack to get to work for now.
// todo may use somehting like :
// todo bytesMap.replace(reader, reader, timestamp, identifier());
VanillaChronicleMap map = bytesMap.delegate;
byte[] result = (byte[]) map.replace(
toByteArray(inWire, ARG_1),
toByteArray(inWire, ARG_2));
boolean isNull = result == null || result.length == 0;
outWire.write(() -> "RESULT_IS_NULL").bool(isNull);
if (!isNull) {
outWire.write(() -> "RESULT");
outWire.bytes().write(result);
}
});
return;
}
@@ -723,7 +738,9 @@ class MapWireHandler<K, V> implements WireHandler {
bytesMap.output = null;
try {
process.accept(bytesMap);
outWire.write(IS_EXCEPTION).bool(false);
} catch (Exception e) {
outWire.write(IS_EXCEPTION).bool(true);
LOG.error("", e);
}