@fluidframework/merge-tree 2.30.0 → 2.31.0

package/lib/test/obliterate.concurrent.spec.js

@@ -321,13 +321,13 @@ for (const incremental of [true, false]) {
             assert.equal(helper.clients.C.getText(), "B");
             helper.logger.validate();
         });
-        it("clones movedClientIds array during insert", () => {
+        it("clones removes array during insert", () => {
             const helper = new ReconnectTestHelper();
             // the bug found here:
             // the X was skipped over by client `A` because it had already been
             // deleted, so its length at refSeq was 0
             //
-            // this was due to the movedClientIds array not being properly cloned
+            // this was due to the removes array not being properly cloned
             // when marking obliterated during insert
             helper.insertText("C", 0, "ABCD");
             helper.processAllOps();
@@ -538,7 +538,7 @@ for (const incremental of [true, false]) {
             assert.equal(helper.clients.B.getText(), "43FBD");
             helper.logger.validate();
         });
-        it("ignores segments where movedSeq < seq for partial len calculations", () => {
+        it("ignores segments obliterated at insertion time for partial len calculations", () => {
             const helper = new ReconnectTestHelper();
             helper.insertText("B", 0, "ABC");
             helper.insertText("A", 0, "DEF");
@@ -606,9 +606,8 @@ for (const incremental of [true, false]) {
             helper.processAllOps();
             helper.logger.validate();
             helper.obliterateRange("B", 1, 2);
-            // bug here: because segment A has already been obliterated, we wouldn't
-            // mark it obliterated by this op as well, meaning that segments in
-            // this range would look to the right and not find a matching move seq
+            // bug here: because segment A has already been obliterated, we previously wouldn't
+            // mark it obliterated by this op as well
             helper.obliterateRange("A", 0, 2);
             helper.insertText("B", 1, "C");
             helper.processAllOps();
@@ -679,7 +678,7 @@ for (const incremental of [true, false]) {
             helper.processAllOps();
             helper.logger.validate();
             // bug here: when the op is acked by client C, it would incorrectly give
-            // segment B the same movedSeq despite coming from a different op
+            // segment B the same obliterate information despite coming from a different op
             helper.obliterateRange("C", 0, 2);
             helper.insertText("B", 2, "D");
             helper.obliterateRange("C", 0, 1);
@@ -726,7 +725,7 @@ for (const incremental of [true, false]) {
             assert.equal(helper.clients.C.getText(), "C");
             helper.logger.validate();
         });
-        it("applies correct movedSeq when right segment has multiple movedSeqs", () => {
+        it("applies correct obliterate when right segment has multiple obliterates", () => {
             const helper = new ReconnectTestHelper();
             // AB
             // (A-C-D-(B))
@@ -735,10 +734,8 @@ for (const incremental of [true, false]) {
             helper.logger.validate();
             helper.obliterateRange("A", 1, 2);
             helper.obliterateRange("B", 0, 2);
-            // bug here: for client B, segment B had multiple movedSeqs, and when
-            // traversal went to the right and found a matching movedSeq in the movedSeqs
-            // array, it selected the lowest seq in the array, which differed from
-            // the correct and matching movedSeq
+            // bug here: for client B, segment B had multiple obliterates and
+            // the wrong one was selected
             helper.insertText("A", 1, "C");
             helper.insertText("A", 2, "D");
             helper.processAllOps();
@@ -747,7 +744,7 @@ for (const incremental of [true, false]) {
             assert.equal(helper.clients.C.getText(), "");
             helper.logger.validate();
         });
-        it("takes the correct moved client id when multiple clientIds for right segment", () => {
+        it("takes the correct remove clientId/stamp when multiple obliterates apply", () => {
             const helper = new ReconnectTestHelper();
             // AB
             // (A-C-D-(B))
@@ -756,8 +753,7 @@ for (const incremental of [true, false]) {
             helper.logger.validate();
             helper.obliterateRange("A", 1, 2);
             // bug here: we would incorrectly take the client id of the first element
-            // in the movedClientIds array because we did not take into account the
-            // length of _both_ the local and non-local movedSeqs arrays
+            // in the removes array
             helper.insertText("A", 1, "C");
             helper.obliterateRange("C", 0, 2);
             helper.insertText("A", 2, "D");
@@ -814,7 +810,7 @@ for (const incremental of [true, false]) {
             assert.equal(helper.clients.C.getText(), "FGHIJE12345AKB");
             helper.logger.validate();
         });
-        it("tracks length at seq of lower move/remove seq when overlapping", () => {
+        it("tracks length at seq of lower remove seq when overlapping", () => {
             const helper = new ReconnectTestHelper();
             // H-FG-A-CDE-B
             // (H-F-[G-A)-C-I-D]-E-B
@@ -828,8 +824,8 @@ for (const incremental of [true, false]) {
             helper.removeRange("B", 2, 6);
             // bug here: this insert triggers a new chunk to be created. when the
             // partial lengths of the new chunk were calculated, it incorrectly
-            // used the removedSeq instead of the moveSeq, despite the latter having
-            // occurred prior to the remove
+            // used a removal seq other than the earliest removal, causing its computed length
+            // to be incorrect
             helper.insertText("A", 1, "I");
             helper.processAllOps();
             assert.equal(helper.clients.A.getText(), "IEB");
@@ -876,8 +872,7 @@ for (const incremental of [true, false]) {
             helper.logger.validate();
             helper.removeRange("C", 6, 7);
             helper.insertText("A", 7, "2");
-            // obliterate at seq 5 isn't getting acked because it stops traversal
-            // at the removed segment, which doesn't have move info
+            // Bug was here: obliterate at seq 5 wasn't getting acked correctly
             helper.obliterateRange("C", 5, 7);
             helper.processAllOps();
             helper.logger.validate();
@@ -942,7 +937,7 @@ for (const incremental of [true, false]) {
             assert.equal(helper.clients.A.getText(), "FZGBA");
             helper.logger.validate();
         });
-        it("wasMovedOnInsert computation remains accurate after leaf node is split", () => {
+        it("wasRemovedOnInsert computation remains accurate after leaf node is split", () => {
             const helper = new ReconnectTestHelper();
             // CD-B-A
             // I-(C-(G)H-E)-F-D-B-A
@@ -1014,7 +1009,7 @@ for (const incremental of [true, false]) {
             assert.equal(helper.clients.A.getText(), "IHEBA");
             helper.logger.validate();
         });
-        it("partial len isLocal when seq is -1 but moveSeq > -1", () => {
+        it("partial len isLocal when seq is local but a non-local obliterate affects the segment", () => {
             const helper = new ReconnectTestHelper();
             // CDEFG-AB
             // C-((D-I-E)-F)-G-A-H-B
@@ -1149,7 +1144,7 @@ for (const incremental of [true, false]) {
             assert.equal(helper.clients.C.getText(), "JIGBA");
             helper.logger.validate();
         });
-        it("obliterate ack traversal is not stopped by moved segment", () => {
+        it("obliterate ack traversal is not stopped by obliterated segment", () => {
             const helper = new ReconnectTestHelper();
             // ABCD
             // (A-(B)-E-C)-D-F