Rework modification iteration and bootstrapping

This commit is contained in:
leventov
2015-12-30 20:38:55 +03:00
parent 19fadf5628
commit b2cd5af700
13 changed files with 486 additions and 392 deletions
@@ -49,8 +49,6 @@ public abstract class ReplicatedInput<K, V, R> implements RemoteOperationContext
}
public void processReplicatedEvent(Bytes replicatedInputBytes) {
long bootstrapTimestamp = replicatedInputBytes.readLong();
long timestamp = replicatedInputBytes.readStopBit();
byte identifier = replicatedInputBytes.readByte();
ru.initReplicationUpdate(identifier, timestamp);
@@ -59,8 +57,6 @@ public abstract class ReplicatedInput<K, V, R> implements RemoteOperationContext
long keySize = mh.m().keySizeMarshaller.readSize(replicatedInputBytes);
long keyOffset = replicatedInputBytes.readPosition();
mh.m().setLastModificationTime(identifier, bootstrapTimestamp);
q.initInputKey(q.getInputKeyBytesAsData(replicatedInputBytes, keyOffset, keySize));
if (isDeleted) {
s.innerUpdateLock.lock();
@@ -79,7 +75,6 @@ public abstract class ReplicatedInput<K, V, R> implements RemoteOperationContext
@Override
public void remotePut(Data<V> newValue, byte remoteIdentifier, long timestamp) {
ru.initReplicationUpdate(remoteIdentifier, timestamp);
mh.m().setLastModificationTime(remoteIdentifier, timestamp);
s.innerUpdateLock.lock();
mh.m().remoteOperations.put(this, newValue);
}
@@ -87,7 +82,6 @@ public abstract class ReplicatedInput<K, V, R> implements RemoteOperationContext
@Override
public void remoteRemove(byte remoteIdentifier, long timestamp) {
ru.initReplicationUpdate(remoteIdentifier, timestamp);
mh.m().setLastModificationTime(remoteIdentifier, timestamp);
s.innerWriteLock.lock();
mh.m().remoteOperations.remove(this);
}
@@ -49,7 +49,7 @@ public abstract class ReplicationUpdate<K> implements RemoteOperationContext<K>
}
public void moveChange(long oldTierIndex, long oldPos, long newPos) {
mh.m().moveChange(oldTierIndex, oldPos, s.tierIndex, newPos, e.timestamp());
mh.m().moveChange(oldTierIndex, oldPos, s.tierIndex, newPos);
}
public void updateChange() {
@@ -59,7 +59,7 @@ public abstract class ReplicationUpdate<K> implements RemoteOperationContext<K>
}
public void raiseChange() {
mh.m().raiseChange(s.tierIndex, e.pos, e.timestamp());
mh.m().raiseChange(s.tierIndex, e.pos);
}
public boolean changed() {