From d713589bd25410c6a15327f96648a778fb0dc2e3 Mon Sep 17 00:00:00 2001 From: Rob Austin Date: Sun, 13 Dec 2015 21:29:55 +0000 Subject: [PATCH] added hasValueChanged to ByteMapEventListener --- .../chronicle/map/BytesMapEventListener.java | 2 +- .../chronicle/map/ReplicatedChronicleMap.java | 15 ++++++----- .../chronicle/map/VanillaChronicleMap.java | 25 ++++++++++++++----- .../chronicle/map/CHMMetaDataTest.java | 2 +- 4 files changed, 30 insertions(+), 14 deletions(-) diff --git a/src/main/java/net/openhft/chronicle/map/BytesMapEventListener.java b/src/main/java/net/openhft/chronicle/map/BytesMapEventListener.java index 7454782d0..d12e21d0f 100644 --- a/src/main/java/net/openhft/chronicle/map/BytesMapEventListener.java +++ b/src/main/java/net/openhft/chronicle/map/BytesMapEventListener.java @@ -48,7 +48,7 @@ public abstract class BytesMapEventListener implements Serializable { } public void onPut(Bytes entry, long metaDataPos, long keyPos, long valuePos, boolean added, - boolean replicationEvent) { + boolean replicationEvent, boolean hasValueChanged) { // do nothing } diff --git a/src/main/java/net/openhft/chronicle/map/ReplicatedChronicleMap.java b/src/main/java/net/openhft/chronicle/map/ReplicatedChronicleMap.java index 791e290b1..729f8c6c3 100644 --- a/src/main/java/net/openhft/chronicle/map/ReplicatedChronicleMap.java +++ b/src/main/java/net/openhft/chronicle/map/ReplicatedChronicleMap.java @@ -931,7 +931,7 @@ final class ReplicatedChronicleMap, onPut(this, segmentState.pos); if (bytesEventListener != null) { long keyPos = metaDataBytes; - bytesEventListener.onPut(entry, 0L, keyPos, segmentState.valueSizePos, true, false); + bytesEventListener.onPut(entry, 0L, keyPos, segmentState.valueSizePos, true, + false, true); } if (eventListener != null) { byte replacedIdentifier = (byte) 0; @@ -2208,7 +2209,7 @@ class VanillaChronicleMap, // put callbacks onPutMaybeRemote(segmentState.pos, false); if (bytesEventListener != null) - bytesEventListener.onPut(entry, 0L, metaDataBytes, valueSizePos, false, false); + bytesEventListener.onPut(entry, 0L, metaDataBytes, valueSizePos, false, false, hasValueChanged); if (eventListener != null) { eventListener.onPut(toKey.toInstance(copies, key, keySize), @@ -2231,7 +2232,7 @@ class VanillaChronicleMap, onPut(this, segmentState.pos); if (bytesEventListener != null) bytesEventListener.onPut(entry, 0L, metaDataBytes, - segmentState.valueSizePos, true, false); + segmentState.valueSizePos, true, false, hasValueChanged); if (eventListener != null) { byte replacedIdentifier = 0; long replacedTimeStamp = 0; @@ -2308,18 +2309,30 @@ class VanillaChronicleMap, readValue.readValue(copies, entry, null, valueSize); } } + + // key is not found VBI valueInterop = getValueInterops.getValueInterop(copies); MVBI metaValueInterop = getValueInterops.getMetaValueInterop(copies, valueInterop, value); + + long valueSize = putEntry(segmentState, metaKeyInterop, keyInterop, key, keySize, metaValueInterop, valueInterop, value, entry, false); + + boolean hasValueChanged = false; + if (eventListener != null || bytesEventListener != null) { + // todo roman to check this + hasValueChanged = + !metaValueInterop.startsWith(valueInterop, entry, value); + } + // put callbacks onPut(this, segmentState.pos); if (bytesEventListener != null) bytesEventListener.onPut(entry, 0L, metaDataBytes, - segmentState.valueSizePos, true, false); + segmentState.valueSizePos, true, false, hasValueChanged); if (eventListener != null) eventListener.onPut(toKey.toInstance(copies, key, keySize), toValue.toInstance(copies, value, valueSize), null, false, true, true, @@ -2384,7 +2397,7 @@ class VanillaChronicleMap, // put callbacks onPutMaybeRemote(segmentState.pos, remote); if (bytesEventListener != null) - bytesEventListener.onPut(entry, 0L, metaDataBytes, valueSizePos, false, remote); + bytesEventListener.onPut(entry, 0L, metaDataBytes, valueSizePos, false, remote, hasValueChanged); if (eventListener != null) { eventListener.onPut(toKey.toInstance(copies, key, keySize), toValue.toInstance(copies, value, valueSize), prevValueInstance, remote, @@ -2785,7 +2798,7 @@ class VanillaChronicleMap, onPut(this, segmentState.pos); if (bytesEventListener != null) { long keyPos = metaDataBytes; - bytesEventListener.onPut(entry, 0L, keyPos, segmentState.valueSizePos, true, false); + bytesEventListener.onPut(entry, 0L, keyPos, segmentState.valueSizePos, true, false, hasValueChanged); } if (eventListener != null) eventListener.onPut(toKey.toInstance(copies, key, keySize), diff --git a/src/test/java/net/openhft/chronicle/map/CHMMetaDataTest.java b/src/test/java/net/openhft/chronicle/map/CHMMetaDataTest.java index 6504a777a..90afdb17f 100644 --- a/src/test/java/net/openhft/chronicle/map/CHMMetaDataTest.java +++ b/src/test/java/net/openhft/chronicle/map/CHMMetaDataTest.java @@ -74,7 +74,7 @@ public class CHMMetaDataTest { } @Override - public void onPut(Bytes entry, long metaDataPos, long keyPos, long valuePos, boolean added, boolean replicationEvent) { + public void onPut(Bytes entry, long metaDataPos, long keyPos, long valuePos, boolean added, boolean replicationEvent, boolean hasValueChanged) { if (added) assertEquals(0, entry.readLong(metaDataPos)); entry.writeLong(metaDataPos, timeStamps.incrementAndGet());