mirrors/loro
1
0
Fork 0
mirror of https://github.com/loro-dev/loro.git synced 2025-02-11 06:42:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: find last_delete_op can return none
Some checks failed
Release WASM / Release (push) Has been cancelled
Details
Test All / build (push) Has been cancelled
Details

Browse source
This commit is contained in:
Zixuan Chen 2024-08-28 01:17:01 +08:00
parent efc50fa9c5
commit 227d1aad2c
No known key found for this signature in database
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
crates/loro-internal/src/loro.rs
View file

@ -1221,7 +1221,10 @@ impl LoroDoc {
.id_to_idx(&pos.container) .id_to_idx(&pos.container)
.ok_or(CannotFindRelativePosition::ContainerDeleted)?; .ok_or(CannotFindRelativePosition::ContainerDeleted)?;
// We know where the target id is when we trace back to the delete_op_id. // We know where the target id is when we trace back to the delete_op_id.
let delete_op_id = find_last_delete_op(&oplog, id, idx).unwrap(); let Some(delete_op_id) = find_last_delete_op(&oplog, id, idx) else {
tracing::error!("Cannot find id {}", id);
return Err(CannotFindRelativePosition::IdNotFound);
};
let mut diff_calc = DiffCalculator::new(); let mut diff_calc = DiffCalculator::new();
let before_frontiers: Frontiers = oplog.dag.find_deps_of_id(delete_op_id); let before_frontiers: Frontiers = oplog.dag.find_deps_of_id(delete_op_id);
let before = &oplog.dag.frontiers_to_vv(&before_frontiers).unwrap(); let before = &oplog.dag.frontiers_to_vv(&before_frontiers).unwrap();
@ -1341,7 +1344,7 @@ impl LoroDoc {
} }
fn find_last_delete_op(oplog: &OpLog, id: ID, idx: ContainerIdx) -> Option<ID> { fn find_last_delete_op(oplog: &OpLog, id: ID, idx: ContainerIdx) -> Option<ID> {
let start_vv = oplog.dag.frontiers_to_vv(&id.into()).unwrap(); let start_vv = oplog.dag.frontiers_to_vv(&id.into())?;
for change in oplog.iter_changes_causally_rev(&start_vv, &oplog.dag.vv) { for change in oplog.iter_changes_causally_rev(&start_vv, &oplog.dag.vv) {
for op in change.ops.iter().rev() { for op in change.ops.iter().rev() {
if op.container != idx { if op.container != idx {