diff --git a/src/main/java/net/openhft/chronicle/map/BytesMapEventListener.java b/src/main/java/net/openhft/chronicle/map/BytesMapEventListener.java
index d12e21d0f..69c83b129 100644
--- a/src/main/java/net/openhft/chronicle/map/BytesMapEventListener.java
+++ b/src/main/java/net/openhft/chronicle/map/BytesMapEventListener.java
@@ -22,23 +22,20 @@ import net.openhft.lang.io.Bytes;
import java.io.Serializable;
/**
- *
- * - Methods must not update {@code entry} state ({@linkplain Bytes#position(long) position},
- * {@linkplain Bytes#limit() limit}).
- * - Methods must not update entry bytes, except in metadata area
- * - From {@code metaDataPos} offset metadata area starts in the given {@code entry}, listener
- * should be itself aware of it's length (see {@link ChronicleMapBuilder#metaDataBytes(int)}).
- * - From {@code keyPos} offset key area in the given {@code entry}, serialized key size
- * (using {@linkplain ChronicleMapBuilder#keySizeMarshaller(SizeMarshaller)}), directly followed
- * by the serialized key itself.
- * - From {@code valuePos} offset value area in the given {@code entry}, serialized value size
- * (using {@linkplain ChronicleMapBuilder#keySizeMarshaller(SizeMarshaller)}), then (optionally)
- * alignment (see {@link ChronicleMapBuilder#entryAndValueAlignment(Alignment)}
- * ), followed by the serialized value itself.
- *
+ * - Methods must not update {@code entry} state ({@linkplain Bytes#position(long) position},
+ * {@linkplain Bytes#limit() limit}).
- Methods must not update entry bytes, except in
+ * metadata area
- From {@code metaDataPos} offset metadata area starts in the given {@code
+ * entry}, listener should be itself aware of it's length (see {@link
+ * ChronicleMapBuilder#metaDataBytes(int)}).
- From {@code keyPos} offset key area in the
+ * given {@code entry}, serialized key size (using {@linkplain ChronicleMapBuilder#keySizeMarshaller(SizeMarshaller)}),
+ * directly followed by the serialized key itself.
- From {@code valuePos} offset value area
+ * in the given {@code entry}, serialized value size (using {@linkplain
+ * ChronicleMapBuilder#keySizeMarshaller(SizeMarshaller)}), then (optionally) alignment (see {@link
+ * ChronicleMapBuilder#entryAndValueAlignment(Alignment)} ), followed by the serialized value
+ * itself.
*
- * There are helper methods {@link ChronicleMap#readKey(Bytes, long)} and
- * {@link ChronicleMap#readValue(Bytes, long)} that help to deal with this.
+ *
There are helper methods {@link ChronicleMap#readKey(Bytes, long)} and {@link
+ * ChronicleMap#readValue(Bytes, long)} that help to deal with this.
*/
public abstract class BytesMapEventListener implements Serializable {
private static final long serialVersionUID = 0L;
@@ -48,12 +45,14 @@ public abstract class BytesMapEventListener implements Serializable {
}
public void onPut(Bytes entry, long metaDataPos, long keyPos, long valuePos, boolean added,
- boolean replicationEvent, boolean hasValueChanged) {
+ boolean replicationEvent, boolean hasValueChanged, byte identifier,
+ byte replacedIdentifier, long timeStamp, long replacedTimeStamp) {
// do nothing
}
public void onRemove(Bytes entry, long metaDataPos, long keyPos, long valuePos,
- boolean replicationEvent) {
+ boolean replicationEvent, byte identifier,
+ byte replacedIdentifier, long timeStamp, long replacedTimeStamp) {
// 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 3e5b52b77..76872a084 100644
--- a/src/main/java/net/openhft/chronicle/map/ReplicatedChronicleMap.java
+++ b/src/main/java/net/openhft/chronicle/map/ReplicatedChronicleMap.java
@@ -950,7 +950,8 @@ final class ReplicatedChronicleMap,
onPut(this, segmentState.pos);
if (bytesEventListener != null) {
long keyPos = metaDataBytes;
+ byte replacedIdentifier = (byte) 0;
+ long replacedTimeStamp = 0;
bytesEventListener.onPut(entry, 0L, keyPos, segmentState.valueSizePos, true,
- false, true);
+ false, true,
+ segmentState.identifier, replacedIdentifier,
+ segmentState.timestamp, replacedTimeStamp);
}
if (eventListener != null) {
byte replacedIdentifier = (byte) 0;
@@ -2209,7 +2213,11 @@ class VanillaChronicleMap,
// put callbacks
onPutMaybeRemote(segmentState.pos, false);
if (bytesEventListener != null)
- bytesEventListener.onPut(entry, 0L, metaDataBytes, valueSizePos, false, false, hasValueChanged);
+ bytesEventListener.onPut(entry, 0L, metaDataBytes, valueSizePos, false,
+ false, hasValueChanged,
+ segmentState.identifier, (byte) 0,
+ segmentState.timestamp, 0
+ );
if (eventListener != null) {
eventListener.onPut(toKey.toInstance(copies, key, keySize),
@@ -2230,9 +2238,14 @@ class VanillaChronicleMap,
// put callbacks
onPut(this, segmentState.pos);
- if (bytesEventListener != null)
+ if (bytesEventListener != null) {
+ byte replacedIdentifier = 0;
+ long replacedTimeStamp = 0;
bytesEventListener.onPut(entry, 0L, metaDataBytes,
- segmentState.valueSizePos, true, false, hasValueChanged);
+ segmentState.valueSizePos, true, false, true,
+ segmentState.identifier, replacedIdentifier,
+ segmentState.timestamp, replacedTimeStamp);
+ }
if (eventListener != null) {
byte replacedIdentifier = 0;
long replacedTimeStamp = 0;
@@ -2332,7 +2345,8 @@ class VanillaChronicleMap,
onPut(this, segmentState.pos);
if (bytesEventListener != null)
bytesEventListener.onPut(entry, 0L, metaDataBytes,
- segmentState.valueSizePos, true, false, hasValueChanged);
+ segmentState.valueSizePos, true, false, hasValueChanged,
+ segmentState.identifier, (byte) 0, segmentState.timestamp, 0);
if (eventListener != null)
eventListener.onPut(toKey.toInstance(copies, key, keySize),
toValue.toInstance(copies, value, valueSize), null, false, true, true,
@@ -2397,7 +2411,10 @@ class VanillaChronicleMap,
// put callbacks
onPutMaybeRemote(segmentState.pos, remote);
if (bytesEventListener != null)
- bytesEventListener.onPut(entry, 0L, metaDataBytes, valueSizePos, false, remote, hasValueChanged);
+ bytesEventListener.onPut(entry, 0L, metaDataBytes, valueSizePos, false, remote,
+ hasValueChanged,
+ segmentState.identifier, replacedIdentifier,
+ segmentState.timestamp, replacedTimestamp);
if (eventListener != null) {
eventListener.onPut(toKey.toInstance(copies, key, keySize),
toValue.toInstance(copies, value, valueSize), prevValueInstance, remote,
@@ -2643,7 +2660,9 @@ class VanillaChronicleMap,
// remove callbacks
onRemoveMaybeRemote(pos, remote);
if (bytesEventListener != null)
- bytesEventListener.onRemove(entry, 0L, metaDataBytes, valueSizePos, remote);
+ bytesEventListener.onRemove(entry, 0L, metaDataBytes, valueSizePos, remote,
+ segmentState.identifier, replacedIdentifier,
+ segmentState.timestamp, replacedTimestamp);
if (eventListener != null) {
V removedValueForEventListener =
toValue.toInstance(copies, removedValue, valueSize);
@@ -2798,7 +2817,10 @@ class VanillaChronicleMap,
onPut(this, segmentState.pos);
if (bytesEventListener != null) {
long keyPos = metaDataBytes;
- bytesEventListener.onPut(entry, 0L, keyPos, segmentState.valueSizePos, true, false, hasValueChanged);
+ bytesEventListener.onPut(entry, 0L, keyPos, segmentState.valueSizePos, true,
+ false, hasValueChanged,
+ segmentState.identifier, replacedIdentifier,
+ segmentState.timestamp, replacedTimestamp);
}
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 90afdb17f..e178c07a7 100644
--- a/src/test/java/net/openhft/chronicle/map/CHMMetaDataTest.java
+++ b/src/test/java/net/openhft/chronicle/map/CHMMetaDataTest.java
@@ -74,15 +74,16 @@ public class CHMMetaDataTest {
}
@Override
- public void onPut(Bytes entry, long metaDataPos, long keyPos, long valuePos, boolean added, boolean replicationEvent, boolean hasValueChanged) {
+ public void onPut(Bytes entry, long metaDataPos, long keyPos, long valuePos, boolean added, boolean replicationEvent, boolean hasValueChanged, byte identifier, byte replacedIdentifier, long timeStamp, long replacedTimeStamp) {
if (added)
assertEquals(0, entry.readLong(metaDataPos));
entry.writeLong(metaDataPos, timeStamps.incrementAndGet());
}
@Override
- public void onRemove(Bytes entry, long metaDataPos, long keyPos, long valuePos, boolean replicationEvent) {
+ public void onRemove(Bytes entry, long metaDataPos, long keyPos, long valuePos, boolean replicationEvent, byte identifier, byte replacedIdentifier, long timeStamp, long replacedTimeStamp) {
System.out.println("Removed entry with ts of " + entry.readLong(metaDataPos));
}
+
}
}