mirror of
https://github.com/OpenHFT/Chronicle-Map.git
synced 2021-09-13 01:26:12 +00:00
Merge remote-tracking branch 'origin/2.1' into 2.1
Conflicts: src/main/java/net/openhft/chronicle/map/ReplicatedChronicleMap.java src/main/java/net/openhft/chronicle/map/VanillaChronicleMap.java
This commit is contained in:
@@ -929,12 +929,12 @@ final class ReplicatedChronicleMap<K, KI, MKI extends MetaBytesInterop<K, ? supe
|
||||
throw defaultValueOrPrepareBytesShouldBeSpecified();
|
||||
}
|
||||
|
||||
final long size = metaElemWriter.size(elemWriter, elem);
|
||||
final long elemSize = metaElemWriter.size(elemWriter, elem);
|
||||
|
||||
putValue(pos, entry, valueSizePos,
|
||||
entryEndAddr, isDeleted,
|
||||
segmentState,
|
||||
metaElemWriter, elemWriter, elem, size,
|
||||
metaElemWriter, elemWriter, elem, elemSize,
|
||||
hashLookup, sizeOfEverythingBeforeValue);
|
||||
pos = segmentState.pos;
|
||||
|
||||
@@ -943,6 +943,7 @@ final class ReplicatedChronicleMap<K, KI, MKI extends MetaBytesInterop<K, ? supe
|
||||
|
||||
entry.position(valueSizePos);
|
||||
long valueSize = readValueSize(entry);
|
||||
assert valueSize == elemSize;
|
||||
long valuePos = entry.position();
|
||||
RV v = readValue.readValue(copies, entry, usingValue, valueSize);
|
||||
|
||||
@@ -1154,9 +1155,9 @@ final class ReplicatedChronicleMap<K, KI, MKI extends MetaBytesInterop<K, ? supe
|
||||
}
|
||||
|
||||
// put callbacks
|
||||
boolean hasValueChanged = updateResult != UpdateResult.UNCHANGED;
|
||||
onPutMaybeRemote(segmentState.pos, false);
|
||||
if (bytesEventListener != null) {
|
||||
boolean hasValueChanged = updateResult != UpdateResult.UNCHANGED;
|
||||
bytesEventListener.onPut(
|
||||
entry, 0L, metaDataBytes, valueSizePos, false, false,
|
||||
hasValueChanged,
|
||||
@@ -1164,7 +1165,6 @@ final class ReplicatedChronicleMap<K, KI, MKI extends MetaBytesInterop<K, ? supe
|
||||
timeStamp, replacedTimestamp);
|
||||
}
|
||||
if (eventListener != null) {
|
||||
boolean hasValueChanged = updateResult != UpdateResult.UNCHANGED;
|
||||
eventListener.onPut(toKey.toInstance(copies, key, keySize),
|
||||
toValue.toInstance(copies, value, valueSize), null, false,
|
||||
isDeleted, hasValueChanged, identifier, replacedIdentifier,
|
||||
@@ -1207,7 +1207,8 @@ final class ReplicatedChronicleMap<K, KI, MKI extends MetaBytesInterop<K, ? supe
|
||||
long replacedTimestamp = 0;
|
||||
|
||||
bytesEventListener.onPut(entry, 0L, metaDataBytes,
|
||||
segmentState.valueSizePos, true, false, true, identifier, replacedIdentifier, timeStamp, replacedTimestamp);
|
||||
segmentState.valueSizePos, true, false, true, identifier,
|
||||
replacedIdentifier, timeStamp, replacedTimestamp);
|
||||
}
|
||||
if (eventListener != null) {
|
||||
byte replacedIdentifier = 0;
|
||||
@@ -1335,7 +1336,8 @@ final class ReplicatedChronicleMap<K, KI, MKI extends MetaBytesInterop<K, ? supe
|
||||
byte replacedIdentifier = 0;
|
||||
long replacedTimestamp = 0;
|
||||
bytesEventListener.onPut(entry, 0L, metaDataBytes,
|
||||
segmentState.valueSizePos, true, remote, true, identifier, replacedIdentifier, timestamp,
|
||||
segmentState.valueSizePos, true, remote, true, identifier,
|
||||
replacedIdentifier, timestamp,
|
||||
replacedTimestamp);
|
||||
}
|
||||
if (eventListener != null) {
|
||||
|
||||
Reference in New Issue
Block a user