@fluidframework/merge-tree 2.22.0 → 2.22.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fluidframework/merge-tree",
-  "version": "2.22.0",
+  "version": "2.22.1",
   "description": "Merge tree",
   "homepage": "https://fluidframework.com",
   "repository": {
@@ -81,30 +81,30 @@
     "temp-directory": "nyc/.nyc_output"
   },
   "dependencies": {
-    "@fluid-internal/client-utils": "~2.22.0",
-    "@fluidframework/container-definitions": "~2.22.0",
-    "@fluidframework/core-interfaces": "~2.22.0",
-    "@fluidframework/core-utils": "~2.22.0",
-    "@fluidframework/datastore-definitions": "~2.22.0",
-    "@fluidframework/driver-definitions": "~2.22.0",
-    "@fluidframework/runtime-definitions": "~2.22.0",
-    "@fluidframework/runtime-utils": "~2.22.0",
-    "@fluidframework/shared-object-base": "~2.22.0",
-    "@fluidframework/telemetry-utils": "~2.22.0"
+    "@fluid-internal/client-utils": "~2.22.1",
+    "@fluidframework/container-definitions": "~2.22.1",
+    "@fluidframework/core-interfaces": "~2.22.1",
+    "@fluidframework/core-utils": "~2.22.1",
+    "@fluidframework/datastore-definitions": "~2.22.1",
+    "@fluidframework/driver-definitions": "~2.22.1",
+    "@fluidframework/runtime-definitions": "~2.22.1",
+    "@fluidframework/runtime-utils": "~2.22.1",
+    "@fluidframework/shared-object-base": "~2.22.1",
+    "@fluidframework/telemetry-utils": "~2.22.1"
   },
   "devDependencies": {
     "@arethetypeswrong/cli": "^0.17.1",
     "@biomejs/biome": "~1.9.3",
-    "@fluid-internal/mocha-test-setup": "~2.22.0",
-    "@fluid-private/stochastic-test-utils": "~2.22.0",
-    "@fluid-private/test-pairwise-generator": "~2.22.0",
+    "@fluid-internal/mocha-test-setup": "~2.22.1",
+    "@fluid-private/stochastic-test-utils": "~2.22.1",
+    "@fluid-private/test-pairwise-generator": "~2.22.1",
     "@fluid-tools/benchmark": "^0.50.0",
     "@fluid-tools/build-cli": "^0.51.0",
     "@fluidframework/build-common": "^2.0.3",
     "@fluidframework/build-tools": "^0.51.0",
     "@fluidframework/eslint-config-fluid": "^5.7.3",
-    "@fluidframework/merge-tree-previous": "npm:@fluidframework/merge-tree@2.21.0",
-    "@fluidframework/test-runtime-utils": "~2.22.0",
+    "@fluidframework/merge-tree-previous": "npm:@fluidframework/merge-tree@2.22.0",
+    "@fluidframework/test-runtime-utils": "~2.22.1",
     "@microsoft/api-extractor": "7.47.8",
     "@types/diff": "^3.5.1",
     "@types/mocha": "^10.0.10",

package/src/mergeTree.ts

@@ -1611,6 +1611,8 @@ export class MergeTree {
 			let normalizedNewestSeq: number = 0;
 			const movedClientIds: number[] = [];
 			const movedSeqs: number[] = [];
+			let newestAcked: ObliterateInfo | undefined;
+			let oldestUnacked: ObliterateInfo | undefined;
 			for (const ob of this.obliterates.findOverlapping(newSegment)) {
 				// compute a normalized seq that takes into account local seqs
 				// but is still comparable to remote seqs to keep the checks below easy
@@ -1641,6 +1643,23 @@ export class MergeTree {
 						normalizedNewestSeq = normalizedObSeq;
 						newest = ob;
 					}
+
+					if (
+						ob.seq !== UnassignedSequenceNumber &&
+						(newestAcked === undefined || newestAcked.seq < ob.seq)
+					) {
+						newestAcked = ob;
+					}
+
+					if (
+						ob.seq === UnassignedSequenceNumber &&
+						(oldestUnacked === undefined || oldestUnacked.localSeq! > ob.localSeq!)
+					) {
+						// There can be one local obliterate surrounding a segment if a client repeatedly obliterates
+						// a region (ex: in the text ABCDEFG, obliterate D, then obliterate CE, then BF). In this case,
+						// the first one that's applied will be the one that actually removes the segment.
+						oldestUnacked = ob;
+					}
 				}
 			}
 
@@ -1649,23 +1668,41 @@ export class MergeTree {
 			// by the same client that's inserting this segment, we let them insert into this range and therefore don't
 			// mark it obliterated.
 			if (oldest && newest?.clientId !== clientId) {
-				const moveInfo: IMoveInfo = {
-					movedClientIds,
-					movedSeq: oldest.seq,
-					movedSeqs,
-					localMovedSeq: oldest.localSeq,
-					wasMovedOnInsert: oldest.seq !== UnassignedSequenceNumber,
-				};
+				let moveInfo: IMoveInfo;
+				if (newestAcked === newest || newestAcked?.clientId !== clientId) {
+					moveInfo = {
+						movedClientIds,
+						movedSeq: oldest.seq,
+						movedSeqs,
+						localMovedSeq: oldestUnacked?.localSeq,
+						wasMovedOnInsert: oldest.seq !== UnassignedSequenceNumber,
+					};
+				} else {
+					assert(
+						oldestUnacked !== undefined,
+						"Expected local obliterate to be defined if newestAcked is not equal to newest",
+					);
+					// There's a pending local obliterate for this range, so it will be marked as obliterated by us. However,
+					// all other clients are under the impression that the most recent acked obliterate won the right to insert
+					// in this range.
+					moveInfo = {
+						movedClientIds: [oldestUnacked.clientId],
+						movedSeq: oldestUnacked.seq,
+						movedSeqs: [oldestUnacked.seq],
+						localMovedSeq: oldestUnacked.localSeq,
+						wasMovedOnInsert: false,
+					};
+				}
 
 				overwriteInfo(newSegment, moveInfo);
 
 				if (moveInfo.localMovedSeq !== undefined) {
 					assert(
-						oldest.segmentGroup !== undefined,
+						oldestUnacked?.segmentGroup !== undefined,
 						0x86c /* expected segment group to exist */,
 					);
 
-					this.addToPendingList(newSegment, oldest.segmentGroup);
+					this.addToPendingList(newSegment, oldestUnacked?.segmentGroup);
 				}
 
 				if (newSegment.parent) {