raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 11

Use full state for the ORSet and ORMap removals until #22648 is fixed

Browse source 
* some tests disabled, search for
  "FIXME use full state for removals, until issue #22648 is fixed"
  to find them
This commit is contained in:
Patrik Nordwall 2017-03-30 13:26:35 +02:00
parent dc070e4e1c
commit 5293666a30
11 changed files with 136 additions and 85 deletions
Download patch file Download diff file Expand all files Collapse all files

15
akka-distributed-data/src/main/scala/akka/cluster/ddata/ORMap.scala
View file

@ -298,8 +298,11 @@ final class ORMap[A, B <: ReplicatedData] private[akka] (
@InternalApi private[akka] def remove(node: UniqueAddress, key: A): ORMap[A, B] = {
// for removals the delta values map emitted will be empty
val newKeys = keys.resetDelta.remove(node, key)
val removeDeltaOp = RemoveDeltaOp(newKeys.delta.get, zeroTag)
new ORMap(newKeys, values - key, zeroTag, Some(newDelta(removeDeltaOp)))
// FIXME use full state for removals, until issue #22648 is fixed
// val removeDeltaOp = RemoveDeltaOp(newKeys.delta.get, zeroTag)
// new ORMap(newKeys, values - key, zeroTag, Some(newDelta(removeDeltaOp)))
new ORMap(newKeys, values - key, zeroTag, delta = None)
}
/**
@ -309,8 +312,10 @@ final class ORMap[A, B <: ReplicatedData] private[akka] (
*/
@InternalApi private[akka] def removeKey(node: UniqueAddress, key: A): ORMap[A, B] = {
val newKeys = keys.resetDelta.remove(node, key)
val removeKeyDeltaOp = RemoveKeyDeltaOp(newKeys.delta.get, key, zeroTag)
new ORMap(newKeys, values, zeroTag, Some(newDelta(removeKeyDeltaOp)))
// FIXME use full state for removals, until issue #22648 is fixed
// val removeKeyDeltaOp = RemoveKeyDeltaOp(newKeys.delta.get, key, zeroTag)
// new ORMap(newKeys, values, zeroTag, Some(newDelta(removeKeyDeltaOp)))
new ORMap(newKeys, values, zeroTag, delta = None)
}
private def dryMerge(that: ORMap[A, B], mergedKeys: ORSet[A], valueKeysIterator: Iterator[A]): ORMap[A, B] = {
@ -389,7 +394,7 @@ final class ORMap[A, B <: ReplicatedData] private[akka] (
updateOp.values.foreach {
case (key, value) ⇒
if (thatValueDeltas.contains(key))
thatValueDeltas = thatValueDeltas + (key → (thatValueDeltas(key) :+ (key, value)))
thatValueDeltas = thatValueDeltas + (key → (thatValueDeltas(key) :+ (key → value)))
else
thatValueDeltas += (key → ((key, value) :: Nil))
}