@fluidframework/matrix 2.41.0 → 2.42.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +4 -0
- package/dist/matrix.d.ts +1 -9
- package/dist/matrix.d.ts.map +1 -1
- package/dist/matrix.js +117 -77
- package/dist/matrix.js.map +1 -1
- package/dist/packageVersion.d.ts +1 -1
- package/dist/packageVersion.js +1 -1
- package/dist/packageVersion.js.map +1 -1
- package/dist/permutationvector.d.ts +4 -1
- package/dist/permutationvector.d.ts.map +1 -1
- package/dist/permutationvector.js +34 -13
- package/dist/permutationvector.js.map +1 -1
- package/lib/matrix.d.ts +1 -9
- package/lib/matrix.d.ts.map +1 -1
- package/lib/matrix.js +117 -77
- package/lib/matrix.js.map +1 -1
- package/lib/packageVersion.d.ts +1 -1
- package/lib/packageVersion.js +1 -1
- package/lib/packageVersion.js.map +1 -1
- package/lib/permutationvector.d.ts +4 -1
- package/lib/permutationvector.d.ts.map +1 -1
- package/lib/permutationvector.js +34 -13
- package/lib/permutationvector.js.map +1 -1
- package/package.json +19 -18
- package/src/matrix.ts +169 -101
- package/src/packageVersion.ts +1 -1
- package/src/permutationvector.ts +45 -19
package/CHANGELOG.md
CHANGED
package/dist/matrix.d.ts
CHANGED
|
@@ -206,6 +206,7 @@ export declare class SharedMatrix<T = any> extends SharedObject<ISharedMatrixEve
|
|
|
206
206
|
protected onConnect(): void;
|
|
207
207
|
private rebasePosition;
|
|
208
208
|
protected reSubmitCore(incoming: unknown, localOpMetadata: unknown): void;
|
|
209
|
+
protected rollback(content: unknown, localOpMetadata: unknown): void;
|
|
209
210
|
protected onDisconnect(): void;
|
|
210
211
|
/**
|
|
211
212
|
* {@inheritDoc @fluidframework/shared-object-base#SharedObject.loadCore}
|
|
@@ -222,15 +223,6 @@ export declare class SharedMatrix<T = any> extends SharedObject<ISharedMatrixEve
|
|
|
222
223
|
private readonly onRowHandlesRecycled;
|
|
223
224
|
private readonly onColHandlesRecycled;
|
|
224
225
|
switchSetCellPolicy(): void;
|
|
225
|
-
/**
|
|
226
|
-
* Returns true if the latest pending write to the cell indicated by the given row/col handles
|
|
227
|
-
* matches the given 'localSeq'.
|
|
228
|
-
*
|
|
229
|
-
* A return value of `true` indicates that there are no later local operations queued that will
|
|
230
|
-
* clobber the write op at the given 'localSeq'. This includes later ops that overwrite the cell
|
|
231
|
-
* with a different value as well as row/col removals that might recycled the given row/col handles.
|
|
232
|
-
*/
|
|
233
|
-
private isLatestPendingWrite;
|
|
234
226
|
toString(): string;
|
|
235
227
|
/**
|
|
236
228
|
* {@inheritDoc @fluidframework/shared-object-base#SharedObjectCore.applyStashedOp}
|
package/dist/matrix.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"matrix.d.ts","sourceRoot":"","sources":["../src/matrix.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EACN,MAAM,EACN,qBAAqB,EACrB,KAAK,cAAc,EACnB,MAAM,iCAAiC,CAAC;AAEzC,OAAO,EACN,kBAAkB,EAClB,sBAAsB,EACtB,KAAK,QAAQ,EACb,sBAAsB,EACtB,MAAM,gDAAgD,CAAC;AACxD,OAAO,EAAE,yBAAyB,EAAE,MAAM,6CAA6C,CAAC;AACxF,OAAO,EAEN,YAAY,EAOZ,MAAM,qCAAqC,CAAC;AAC7C,OAAO,EAAE,qBAAqB,EAAE,MAAM,8CAA8C,CAAC;AAKrF,OAAO,EACN,gBAAgB,EAChB,mBAAmB,EACnB,YAAY,EACZ,MAAM,6CAA6C,CAAC;AAErD,OAAO,EACN,eAAe,EACf,eAAe,EACf,aAAa,EACb,aAAa,EACb,MAAM,iBAAiB,CAAC;AAKzB,OAAO,EAEN,UAAU,EAKV,MAAM,UAAU,CAAC;AAKlB,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAY3C;;;;GAIG;AACH,MAAM,WAAW,mBAAmB,CAAC,CAAC,CAAE,SAAQ,MAAM;IACrD;;;;;;;;;;;;;;;;;;OAkBG;IACH,CACC,KAAK,EAAE,UAAU,EACjB,QAAQ,EAAE,CACT,GAAG,EAAE,MAAM,EACX,GAAG,EAAE,MAAM,EACX,YAAY,EAAE,UAAU,CAAC,CAAC,CAAC,EAC3B,gBAAgB,EAAE,UAAU,CAAC,CAAC,CAAC,EAC/B,MAAM,EAAE,qBAAqB,KACzB,IAAI,GACP,IAAI,CAAC;CACR;AAUD;;;GAGG;AAIH,MAAM,WAAW,aAAa,CAAC,CAAC,GAAG,GAAG,CACrC,SAAQ,cAAc,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC,EAC7C,eAAe,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,EAC9B,aAAa,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,EAC5B,aAAa,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,EAC5B,QAAQ;IACT;;;;;;OAMG;IACH,UAAU,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IAClD;;;;;;OAMG;IACH,UAAU,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IAClD;;;;;;OAMG;IACH,UAAU,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IAClD;;;;;;OAMG;IACH,UAAU,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IAElD;;;;;;;;;;;OAWG;IACH,QAAQ,CACP,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,SAAS,UAAU,CAAC,CAAC,CAAC,EAAE,GAC9B,IAAI,CAAC;IAER;;;OAGG;IACH,QAAQ,CAAC,QAAQ,EAAE,aAAa,GAAG,IAAI,CAAC;IAExC;;;OAGG;IACH,oCAAoC,IAAI,OAAO,CAAC;IAEhD;;;;;;;OAOG;IACH,mBAAmB,IAAI,IAAI,CAAC;CAC5B;
|
|
1
|
+
{"version":3,"file":"matrix.d.ts","sourceRoot":"","sources":["../src/matrix.ts"],"names":[],"mappings":"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"}
|
package/dist/matrix.js
CHANGED
|
@@ -188,18 +188,18 @@ class SharedMatrix extends internal_4.SharedObject {
|
|
|
188
188
|
}
|
|
189
189
|
}
|
|
190
190
|
}
|
|
191
|
-
setCellCore(row, col, value, rowHandle = this.rows.getAllocatedHandle(row), colHandle = this.cols.getAllocatedHandle(col)) {
|
|
191
|
+
setCellCore(row, col, value, rowHandle = this.rows.getAllocatedHandle(row), colHandle = this.cols.getAllocatedHandle(col), rollback) {
|
|
192
192
|
this.protectAgainstReentrancy(() => {
|
|
193
|
+
const oldValue = this.cells.getCell(rowHandle, colHandle) ?? undefined;
|
|
193
194
|
if (this.undo !== undefined) {
|
|
194
|
-
let oldValue = this.cells.getCell(rowHandle, colHandle);
|
|
195
|
-
if (oldValue === null) {
|
|
196
|
-
oldValue = undefined;
|
|
197
|
-
}
|
|
198
195
|
this.undo.cellSet(rowHandle, colHandle, oldValue);
|
|
199
196
|
}
|
|
200
197
|
this.cells.setCell(rowHandle, colHandle, value);
|
|
201
|
-
if (this.isAttached()) {
|
|
202
|
-
this.sendSetCellOp(row, col, value, rowHandle, colHandle);
|
|
198
|
+
if (this.isAttached() && rollback !== true) {
|
|
199
|
+
const pending = this.sendSetCellOp(row, col, value, rowHandle, colHandle);
|
|
200
|
+
if (pending.local.length === 1) {
|
|
201
|
+
pending.consensus ??= oldValue;
|
|
202
|
+
}
|
|
203
203
|
}
|
|
204
204
|
// Avoid reentrancy by raising change notifications after the op is queued.
|
|
205
205
|
for (const consumer of this.consumers.values()) {
|
|
@@ -232,7 +232,12 @@ class SharedMatrix extends internal_4.SharedObject {
|
|
|
232
232
|
referenceSeqNumber: this.deltaManager.lastSequenceNumber,
|
|
233
233
|
};
|
|
234
234
|
this.submitLocalMessage(op, metadata);
|
|
235
|
-
this.pending.
|
|
235
|
+
const pendingCell = this.pending.getCell(rowHandle, colHandle) ?? {
|
|
236
|
+
local: [],
|
|
237
|
+
};
|
|
238
|
+
pendingCell.local.push({ localSeq, value });
|
|
239
|
+
this.pending.setCell(rowHandle, colHandle, pendingCell);
|
|
240
|
+
return pendingCell;
|
|
236
241
|
}
|
|
237
242
|
/**
|
|
238
243
|
* This makes sure that the code inside the callback is not reentrant. We need to do that because we raise notifications
|
|
@@ -370,7 +375,16 @@ class SharedMatrix extends internal_4.SharedObject {
|
|
|
370
375
|
const builder = new internal_3.SummaryTreeBuilder();
|
|
371
376
|
builder.addWithStats(ops_js_1.SnapshotPath.rows, this.rows.summarize(this.runtime, this.handle, serializer));
|
|
372
377
|
builder.addWithStats(ops_js_1.SnapshotPath.cols, this.cols.summarize(this.runtime, this.handle, serializer));
|
|
373
|
-
const artifactsToSummarize = [
|
|
378
|
+
const artifactsToSummarize = [
|
|
379
|
+
this.cells.snapshot(),
|
|
380
|
+
/**
|
|
381
|
+
* we used to write this.pending.snapshot(). this should have never been done, as pending is only for local
|
|
382
|
+
* changes, and there should never be local changes in the summarizer. This was also never used on load
|
|
383
|
+
* as there is no way to understand a previous clients pending changes. so we just set this to a constant
|
|
384
|
+
* which matches an empty this.pending.snapshot() for back-compat in terms of the array length
|
|
385
|
+
*/
|
|
386
|
+
[undefined],
|
|
387
|
+
];
|
|
374
388
|
// Only need to store it in the snapshot if we have switched the policy already.
|
|
375
389
|
if (this.fwwPolicy.state === "on") {
|
|
376
390
|
artifactsToSummarize.push(this.fwwPolicy.switchOpSeqNumber, this.fwwPolicy.cellLastWriteTracker.snapshot());
|
|
@@ -452,31 +466,36 @@ class SharedMatrix extends internal_4.SharedObject {
|
|
|
452
466
|
const col = this.rebasePosition(this.cols, colsRef, localSeq);
|
|
453
467
|
this.rows.removeLocalReferencePosition(rowsRef);
|
|
454
468
|
this.cols.removeLocalReferencePosition(colsRef);
|
|
455
|
-
|
|
456
|
-
|
|
469
|
+
const pendingCell = this.pending.getCell(rowHandle, colHandle);
|
|
470
|
+
(0, internal_1.assert)(pendingCell !== undefined, 0xba4 /* local operation must have a pending array */);
|
|
471
|
+
const { local } = pendingCell;
|
|
472
|
+
(0, internal_1.assert)(local !== undefined, 0xba5 /* local operation must have a pending array */);
|
|
473
|
+
const localSeqIndex = local.findIndex((p) => p.localSeq === localSeq);
|
|
474
|
+
(0, internal_1.assert)(localSeqIndex >= 0, 0xba6 /* local operation must have a pending entry */);
|
|
475
|
+
const [change] = local.splice(localSeqIndex, 1);
|
|
476
|
+
(0, internal_1.assert)(change.localSeq === localSeq, 0xba7 /* must match */);
|
|
477
|
+
if (row !== undefined &&
|
|
478
|
+
col !== undefined &&
|
|
479
|
+
row >= 0 &&
|
|
480
|
+
col >= 0 && // If the mode is LWW, then send the op.
|
|
457
481
|
// Otherwise if the current mode is FWW and if we generated this op, after seeing the
|
|
458
482
|
// last set op, or it is the first set op for the cell, then regenerate the op,
|
|
459
483
|
// otherwise raise conflict. We want to check the current mode here and not that
|
|
460
484
|
// whether op was made in FWW or not.
|
|
461
|
-
|
|
485
|
+
(this.fwwPolicy.state !== "on" ||
|
|
462
486
|
referenceSeqNumber >=
|
|
463
|
-
(this.fwwPolicy.cellLastWriteTracker.getCell(rowHandle, colHandle)?.seqNum ?? 0)) {
|
|
464
|
-
|
|
465
|
-
}
|
|
466
|
-
else if (this.pending.getCell(rowHandle, colHandle) !== undefined) {
|
|
467
|
-
// Clear the pending changes if any as we are not sending the op.
|
|
468
|
-
this.pending.setCell(rowHandle, colHandle, undefined);
|
|
469
|
-
}
|
|
487
|
+
(this.fwwPolicy.cellLastWriteTracker.getCell(rowHandle, colHandle)?.seqNum ?? 0))) {
|
|
488
|
+
this.sendSetCellOp(row, col, setOp.value, rowHandle, colHandle, localSeq);
|
|
470
489
|
}
|
|
471
490
|
}
|
|
472
491
|
else {
|
|
473
492
|
switch (content.target) {
|
|
474
493
|
case ops_js_1.SnapshotPath.cols: {
|
|
475
|
-
this.submitColMessage(this.cols.regeneratePendingOp(content, localOpMetadata));
|
|
494
|
+
this.submitColMessage(this.cols.regeneratePendingOp(content, localOpMetadata, false));
|
|
476
495
|
break;
|
|
477
496
|
}
|
|
478
497
|
case ops_js_1.SnapshotPath.rows: {
|
|
479
|
-
this.submitRowMessage(this.rows.regeneratePendingOp(content, localOpMetadata));
|
|
498
|
+
this.submitRowMessage(this.rows.regeneratePendingOp(content, localOpMetadata, false));
|
|
480
499
|
break;
|
|
481
500
|
}
|
|
482
501
|
default: {
|
|
@@ -485,6 +504,33 @@ class SharedMatrix extends internal_4.SharedObject {
|
|
|
485
504
|
}
|
|
486
505
|
}
|
|
487
506
|
}
|
|
507
|
+
rollback(content, localOpMetadata) {
|
|
508
|
+
const contents = content;
|
|
509
|
+
const target = contents.target;
|
|
510
|
+
switch (target) {
|
|
511
|
+
case ops_js_1.SnapshotPath.cols: {
|
|
512
|
+
this.cols.rollback(content, localOpMetadata);
|
|
513
|
+
break;
|
|
514
|
+
}
|
|
515
|
+
case ops_js_1.SnapshotPath.rows: {
|
|
516
|
+
this.rows.rollback(content, localOpMetadata);
|
|
517
|
+
break;
|
|
518
|
+
}
|
|
519
|
+
case undefined: {
|
|
520
|
+
(0, internal_1.assert)(contents.type === ops_js_1.MatrixOp.set, 0xba8 /* only sets supported */);
|
|
521
|
+
const setMetadata = localOpMetadata;
|
|
522
|
+
const pendingCell = this.pending.getCell(setMetadata.rowHandle, setMetadata.colHandle);
|
|
523
|
+
(0, internal_1.assert)(pendingCell !== undefined, 0xba9 /* must have pending */);
|
|
524
|
+
const change = pendingCell.local.pop();
|
|
525
|
+
(0, internal_1.assert)(change?.localSeq === setMetadata.localSeq, 0xbaa /* must have change */);
|
|
526
|
+
const previous = pendingCell.local.length > 0
|
|
527
|
+
? pendingCell.local[pendingCell.local.length - 1].value
|
|
528
|
+
: pendingCell.consensus;
|
|
529
|
+
this.setCellCore(contents.row, contents.col, previous, setMetadata.rowHandle, setMetadata.colHandle, true);
|
|
530
|
+
}
|
|
531
|
+
default:
|
|
532
|
+
}
|
|
533
|
+
}
|
|
488
534
|
onDisconnect() { }
|
|
489
535
|
/**
|
|
490
536
|
* {@inheritDoc @fluidframework/shared-object-base#SharedObject.loadCore}
|
|
@@ -568,63 +614,76 @@ class SharedMatrix extends internal_4.SharedObject {
|
|
|
568
614
|
if (local) {
|
|
569
615
|
// We are receiving the ACK for a local pending set operation.
|
|
570
616
|
const { rowHandle, colHandle, localSeq, rowsRef, colsRef } = localOpMetadata;
|
|
571
|
-
const isLatestPendingOp = this.isLatestPendingWrite(rowHandle, colHandle, localSeq);
|
|
572
617
|
this.rows.removeLocalReferencePosition(rowsRef);
|
|
573
618
|
this.cols.removeLocalReferencePosition(colsRef);
|
|
619
|
+
const pendingCell = this.pending.getCell(rowHandle, colHandle);
|
|
620
|
+
const ackedChange = pendingCell?.local.shift();
|
|
621
|
+
(0, internal_1.assert)(ackedChange?.localSeq === localSeq, 0xbab /* must match */);
|
|
622
|
+
if (pendingCell?.local.length === 0) {
|
|
623
|
+
this.pending.setCell(rowHandle, colHandle, undefined);
|
|
624
|
+
}
|
|
574
625
|
// If policy is switched and cell should be modified too based on policy, then update the tracker.
|
|
575
626
|
// If policy is not switched, then also update the tracker in case it is the latest.
|
|
576
627
|
if (this.fwwPolicy.state === "on" &&
|
|
577
628
|
this.shouldSetCellBasedOnFWW(rowHandle, colHandle, msg)) {
|
|
629
|
+
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
|
|
630
|
+
pendingCell.consensus = ackedChange.value;
|
|
578
631
|
this.fwwPolicy.cellLastWriteTracker.setCell(rowHandle, colHandle, {
|
|
579
632
|
seqNum: msg.sequenceNumber,
|
|
580
633
|
clientId: msg.clientId,
|
|
581
634
|
});
|
|
582
635
|
}
|
|
583
|
-
if (isLatestPendingOp) {
|
|
584
|
-
this.pending.setCell(rowHandle, colHandle, undefined);
|
|
585
|
-
}
|
|
586
636
|
}
|
|
587
637
|
else {
|
|
588
638
|
const adjustedRow = this.rows.adjustPosition(row, msg);
|
|
589
|
-
|
|
590
|
-
|
|
591
|
-
|
|
592
|
-
|
|
593
|
-
|
|
594
|
-
|
|
595
|
-
|
|
596
|
-
|
|
597
|
-
|
|
598
|
-
|
|
599
|
-
|
|
600
|
-
|
|
601
|
-
|
|
602
|
-
|
|
603
|
-
|
|
604
|
-
|
|
605
|
-
|
|
606
|
-
|
|
607
|
-
|
|
608
|
-
|
|
609
|
-
|
|
610
|
-
|
|
611
|
-
|
|
612
|
-
|
|
613
|
-
|
|
614
|
-
|
|
615
|
-
|
|
616
|
-
|
|
639
|
+
const adjustedCol = this.cols.adjustPosition(col, msg);
|
|
640
|
+
const rowHandle = adjustedRow.handle;
|
|
641
|
+
const colHandle = adjustedCol.handle;
|
|
642
|
+
(0, internal_1.assert)((0, handletable_js_1.isHandleValid)(rowHandle) && (0, handletable_js_1.isHandleValid)(colHandle), 0x022 /* "SharedMatrix row and/or col handles are invalid!" */);
|
|
643
|
+
const pendingCell = this.pending.getCell(rowHandle, colHandle);
|
|
644
|
+
if (this.fwwPolicy.state === "on") {
|
|
645
|
+
// If someone tried to Overwrite the cell value or first write on this cell or
|
|
646
|
+
// same client tried to modify the cell or if the previous mode was LWW, then we need to still
|
|
647
|
+
// overwrite the cell and raise conflict if we have pending changes as our change is going to be lost.
|
|
648
|
+
if (this.shouldSetCellBasedOnFWW(rowHandle, colHandle, msg)) {
|
|
649
|
+
const previousValue = this.cells.getCell(rowHandle, colHandle);
|
|
650
|
+
this.cells.setCell(rowHandle, colHandle, value);
|
|
651
|
+
this.fwwPolicy.cellLastWriteTracker.setCell(rowHandle, colHandle, {
|
|
652
|
+
seqNum: msg.sequenceNumber,
|
|
653
|
+
clientId: msg.clientId,
|
|
654
|
+
});
|
|
655
|
+
if (pendingCell !== undefined) {
|
|
656
|
+
pendingCell.consensus = value;
|
|
657
|
+
}
|
|
658
|
+
if (adjustedRow.pos !== undefined && adjustedCol.pos !== undefined) {
|
|
659
|
+
for (const consumer of this.consumers.values()) {
|
|
660
|
+
consumer.cellsChanged(adjustedRow.pos, adjustedCol.pos, 1, 1, this);
|
|
661
|
+
}
|
|
662
|
+
// Check is there are any pending changes, which will be rejected. If so raise conflict.
|
|
663
|
+
if (pendingCell !== undefined && pendingCell.local.length > 0) {
|
|
664
|
+
// Don't reset the pending value yet, as there maybe more fww op from same client, so we want
|
|
665
|
+
// to raise conflict event for that op also.
|
|
666
|
+
this.emit("conflict", row, col, value, // Current value
|
|
667
|
+
previousValue, // Ignored local value
|
|
668
|
+
this);
|
|
617
669
|
}
|
|
618
670
|
}
|
|
619
|
-
|
|
620
|
-
|
|
621
|
-
|
|
622
|
-
|
|
671
|
+
}
|
|
672
|
+
}
|
|
673
|
+
else {
|
|
674
|
+
if (pendingCell === undefined || pendingCell.local.length === 0) {
|
|
675
|
+
// If there is a pending (unACKed) local write to the same cell, skip the current op
|
|
676
|
+
// since it "happened before" the pending write.
|
|
677
|
+
this.cells.setCell(rowHandle, colHandle, value);
|
|
678
|
+
if (adjustedRow.pos !== undefined && adjustedCol.pos !== undefined) {
|
|
623
679
|
for (const consumer of this.consumers.values()) {
|
|
624
|
-
consumer.cellsChanged(adjustedRow, adjustedCol, 1, 1, this);
|
|
680
|
+
consumer.cellsChanged(adjustedRow.pos, adjustedCol.pos, 1, 1, this);
|
|
625
681
|
}
|
|
626
682
|
}
|
|
627
683
|
}
|
|
684
|
+
else {
|
|
685
|
+
pendingCell.consensus = value;
|
|
686
|
+
}
|
|
628
687
|
}
|
|
629
688
|
}
|
|
630
689
|
break;
|
|
@@ -645,25 +704,6 @@ class SharedMatrix extends internal_4.SharedObject {
|
|
|
645
704
|
};
|
|
646
705
|
}
|
|
647
706
|
}
|
|
648
|
-
/**
|
|
649
|
-
* Returns true if the latest pending write to the cell indicated by the given row/col handles
|
|
650
|
-
* matches the given 'localSeq'.
|
|
651
|
-
*
|
|
652
|
-
* A return value of `true` indicates that there are no later local operations queued that will
|
|
653
|
-
* clobber the write op at the given 'localSeq'. This includes later ops that overwrite the cell
|
|
654
|
-
* with a different value as well as row/col removals that might recycled the given row/col handles.
|
|
655
|
-
*/
|
|
656
|
-
isLatestPendingWrite(rowHandle, colHandle, localSeq) {
|
|
657
|
-
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
|
|
658
|
-
const pendingLocalSeq = this.pending.getCell(rowHandle, colHandle);
|
|
659
|
-
// Note while we're awaiting the ACK for a local set, it's possible for the row/col to be
|
|
660
|
-
// locally removed and the row/col handles recycled. If this happens, the pendingLocalSeq will
|
|
661
|
-
// be 'undefined' or > 'localSeq'.
|
|
662
|
-
(0, internal_1.assert)(!(pendingLocalSeq < localSeq), 0x023 /* "The 'localSeq' of pending write (if any) must be <= the localSeq of the currently processed op." */);
|
|
663
|
-
// If this is the most recent write to the cell by the local client, the stored localSeq
|
|
664
|
-
// will be an exact match for the given 'localSeq'.
|
|
665
|
-
return pendingLocalSeq === localSeq;
|
|
666
|
-
}
|
|
667
707
|
toString() {
|
|
668
708
|
let s = `client:${this.runtime.clientId}\nrows: ${this.rows.toString()}\ncols: ${this.cols.toString()}\n\n`;
|
|
669
709
|
for (let r = 0; r < this.rowCount; r++) {
|