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

fix issue with vvector handling in ORSet.mergeRemoveDelta #22890

Browse source
This commit is contained in:
gosubpl 2017-09-25 16:16:20 +02:00 • committed by Johan Andrén
parent 12196d674e
commit 9d7b81f11c
2 changed files with 16 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
akka-distributed-data/src/main/scala/akka/cluster/ddata/ORSet.scala
View file

@ -463,7 +463,8 @@ final class ORSet[A] private[akka] (
elementsMap
}
clearAncestor()
val newVvector = vvector.merge(that.vvector)
val newVvector = vvector.merge(thatDot)
new ORSet(newElementsMap, newVvector)
}

14
akka-distributed-data/src/test/scala/akka/cluster/ddata/ORSetSpec.scala
View file

@ -591,6 +591,20 @@ class ORSetSpec extends WordSpec with Matchers {
b3.merge(a3).merge(c).elements should be(Set.empty)
}
"not pollute the vvector of result during mergeRemoveDelta" in {
val a = ORSet().add(nodeA, "a")
val a1 = a.add(nodeB, "b").remove(nodeB, "b").resetDelta.remove(nodeA, "a") // a1 now contains dot from nodeB
a.vvector.contains(nodeA) should be(true)
a.vvector.contains(nodeB) should be(false)
a1.vvector.contains(nodeA) should be(true)
a1.vvector.contains(nodeB) should be(true)
val a2 = ORSet().mergeDelta(a.delta.get).mergeDelta(a1.delta.get)
a2.elements should be(Set.empty)
a2.vvector.contains(nodeB) should be(false) // a2 should not be polluted by the nodeB dot, as all operations on it pertained only to elements from nodeA
}
"have unapply extractor" in {
val s1 = ORSet.empty.add(node1, "a").add(node2, "b")
val s2: ORSet[String] = s1