Skip to content

Commit d10360e

Browse files
Leeeon233Leeeon233
committed
fix: return err apply op
1 parent 4b5e8ca commit d10360e

File tree

6 files changed

+20
-122
lines changed

6 files changed

+20
-122
lines changed

‎crates/loro-internal/src/fuzz/tree.rs

-88
Original file line numberDiff line numberDiff line change
@@ -103,37 +103,6 @@ impl Actor {
103103
);
104104
}));
105105

106-
let text = Arc::clone(&actor.text_tracker);
107-
// actor.loro.subscribe(
108-
// &ContainerID::new_root("text", ContainerType::Text),
109-
// Arc::new(move |event| {
110-
// if event.from_children {
111-
// return;
112-
// }
113-
// let mut text = text.lock().unwrap();
114-
// match &event.container.diff {
115-
// Diff::Text(delta) => {
116-
// let mut index = 0;
117-
// for item in delta.iter() {
118-
// match item {
119-
// DeltaItem::Retain { len, meta: _ } => {
120-
// index += len;
121-
// }
122-
// DeltaItem::Insert { value, meta: _ } => {
123-
// text.insert_str(index, value);
124-
// index += value.len();
125-
// }
126-
// DeltaItem::Delete { len, .. } => {
127-
// text.drain(index..index + *len);
128-
// }
129-
// }
130-
// }
131-
// }
132-
// _ => unreachable!(),
133-
// }
134-
// }),
135-
// );
136-
137106
let tree = Arc::clone(&actor.tree_tracker);
138107
actor.loro.subscribe(
139108
&ContainerID::new_root("tree", ContainerType::Tree),
@@ -164,63 +133,6 @@ impl Actor {
164133
}),
165134
);
166135

167-
let map = Arc::clone(&actor.map_tracker);
168-
actor.loro.subscribe(
169-
&ContainerID::new_root("map", ContainerType::Map),
170-
Arc::new(move |event| {
171-
if event.from_children {
172-
return;
173-
}
174-
let mut map = map.lock().unwrap();
175-
if let Diff::NewMap(map_diff) = &event.container.diff {
176-
for (key, value) in map_diff.updated.iter() {
177-
match &value.value {
178-
Some(value) => {
179-
map.insert(key.to_string(), value.clone());
180-
}
181-
None => {
182-
map.remove(&key.to_string());
183-
}
184-
}
185-
}
186-
} else {
187-
debug_dbg!(&event.container);
188-
unreachable!()
189-
}
190-
}),
191-
);
192-
193-
let list = Arc::clone(&actor.list_tracker);
194-
actor.loro.subscribe(
195-
&ContainerID::new_root("list", ContainerType::List),
196-
Arc::new(move |event| {
197-
if event.from_children {
198-
return;
199-
}
200-
let mut list = list.lock().unwrap();
201-
if let Diff::List(delta) = &event.container.diff {
202-
let mut index = 0;
203-
for item in delta.iter() {
204-
match item {
205-
DeltaItem::Retain { len, meta: _ } => {
206-
index += len;
207-
}
208-
DeltaItem::Insert { value, meta: _ } => {
209-
for v in value {
210-
list.insert(index, v.clone());
211-
index += 1;
212-
}
213-
}
214-
DeltaItem::Delete { len, .. } => {
215-
list.drain(index..index + *len);
216-
}
217-
}
218-
}
219-
} else {
220-
unreachable!()
221-
}
222-
}),
223-
);
224136
actor
225137
.text_containers
226138
.push(actor.loro.txn().unwrap().get_text("text"));

‎crates/loro-internal/src/state.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ pub trait ContainerState: Clone {
5757
self.apply_diff_and_convert(diff, arena);
5858
}
5959

60-
fn apply_op(&mut self, raw_op: &RawOp, op: &Op, arena: &SharedArena);
60+
fn apply_op(&mut self, raw_op: &RawOp, op: &Op, arena: &SharedArena) -> LoroResult<()>;
6161
/// Convert a state to a diff, such that an empty state will be transformed into the same as this state when it's applied.
6262
fn to_diff(&mut self) -> Diff;
6363

@@ -281,7 +281,7 @@ impl DocState {
281281
}
282282

283283
// TODO: make apply_op return a result
284-
state.apply_op(raw_op, op, &self.arena);
284+
state.apply_op(raw_op, op, &self.arena)?;
285285
Ok(())
286286
}
287287

‎crates/loro-internal/src/state/list_state.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ use generic_btree::{
1818
rle::{HasLength, Mergeable, Sliceable},
1919
ArenaIndex, BTree, BTreeTrait, Cursor, LeafIndex, LengthFinder, UseLengthFinder,
2020
};
21+
use loro_common::LoroResult;
2122

2223
type ContainerMapping = Arc<Mutex<FxHashMap<ContainerID, ArenaIndex>>>;
2324

@@ -368,7 +369,7 @@ impl ContainerState for ListState {
368369
}
369370
}
370371

371-
fn apply_op(&mut self, op: &RawOp, _: &Op, arena: &SharedArena) {
372+
fn apply_op(&mut self, op: &RawOp, _: &Op, arena: &SharedArena) -> LoroResult<()> {
372373
match &op.content {
373374
RawOpContent::Map(_) => unreachable!(),
374375
RawOpContent::Tree(_) => unreachable!(),
@@ -405,6 +406,7 @@ impl ContainerState for ListState {
405406
crate::container::list::list_op::ListOp::StyleEnd { .. } => unreachable!(),
406407
},
407408
}
409+
Ok(())
408410
}
409411

410412
#[doc = " Start a transaction"]

‎crates/loro-internal/src/state/map_state.rs

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use std::{mem, sync::Arc};
22

33
use fxhash::FxHashMap;
4-
use loro_common::ContainerID;
4+
use loro_common::{ContainerID, LoroResult};
55

66
use crate::{
77
arena::SharedArena,
@@ -41,7 +41,7 @@ impl ContainerState for MapState {
4141
Diff::NewMap(delta)
4242
}
4343

44-
fn apply_op(&mut self, op: &RawOp, _: &Op, arena: &SharedArena) {
44+
fn apply_op(&mut self, op: &RawOp, _: &Op, arena: &SharedArena) -> LoroResult<()> {
4545
match &op.content {
4646
RawOpContent::Map(MapSet { key, value }) => {
4747
if value.is_none() {
@@ -53,7 +53,7 @@ impl ContainerState for MapState {
5353
value: None,
5454
},
5555
);
56-
return;
56+
return Ok(());
5757
}
5858
let value = value.clone().unwrap();
5959
if value.is_container() {
@@ -68,7 +68,8 @@ impl ContainerState for MapState {
6868
counter: op.id.counter,
6969
value: Some(value),
7070
},
71-
)
71+
);
72+
Ok(())
7273
}
7374
RawOpContent::List(_) => unreachable!(),
7475
RawOpContent::Tree(_) => unreachable!(),

‎crates/loro-internal/src/state/richtext_state.rs

+3-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use std::{ops::Range, sync::Arc};
22

33
use fxhash::FxHashMap;
44
use generic_btree::rle::HasLength;
5-
use loro_common::{Counter, LoroValue, PeerID, ID};
5+
use loro_common::{Counter, LoroResult, LoroValue, PeerID, ID};
66
use loro_preload::{CommonArena, EncodedRichtextState, TempArena, TextRanges};
77

88
use crate::{
@@ -307,7 +307,7 @@ impl ContainerState for RichtextState {
307307
}
308308
}
309309

310-
fn apply_op(&mut self, r_op: &RawOp, op: &Op, arena: &SharedArena) {
310+
fn apply_op(&mut self, r_op: &RawOp, op: &Op, arena: &SharedArena) -> LoroResult<()> {
311311
match &op.content {
312312
crate::op::InnerContent::List(l) => match l {
313313
list_op::InnerListOp::Insert { slice, pos } => {
@@ -359,6 +359,7 @@ impl ContainerState for RichtextState {
359359
},
360360
_ => unreachable!(),
361361
}
362+
Ok(())
362363
}
363364

364365
fn to_diff(&mut self) -> Diff {

‎crates/loro-internal/src/state/tree_state.rs

+7-25
Original file line numberDiff line numberDiff line change
@@ -222,34 +222,16 @@ impl ContainerState for TreeState {
222222
Diff::Tree(diff.into_tree().unwrap())
223223
}
224224

225-
fn apply_diff(&mut self, diff: crate::event::InternalDiff, _arena: &SharedArena) {
226-
if let InternalDiff::Tree(tree) = &diff {
227-
// assert never cause cycle move
228-
for diff in tree.diff.iter() {
229-
let target = diff.target;
230-
let parent = match diff.action {
231-
TreeDiffItem::CreateOrRestore => None,
232-
TreeDiffItem::Move(parent) => Some(parent),
233-
TreeDiffItem::Delete => TreeID::delete_root(),
234-
TreeDiffItem::UnCreate => {
235-
// delete it from state
236-
self.trees.remove(&target);
237-
continue;
238-
}
239-
};
240-
let old_parent = self.trees.insert(target, parent);
241-
if Some(parent) != old_parent {
242-
self.update_deleted_cache(target, parent, old_parent);
243-
}
244-
}
245-
}
246-
}
247-
248-
fn apply_op(&mut self, raw_op: &RawOp, _op: &crate::op::Op, _arena: &SharedArena) {
225+
fn apply_op(
226+
&mut self,
227+
raw_op: &RawOp,
228+
_op: &crate::op::Op,
229+
_arena: &SharedArena,
230+
) -> LoroResult<()> {
249231
match raw_op.content {
250232
crate::op::RawOpContent::Tree(tree) => {
251233
let TreeOp { target, parent, .. } = tree;
252-
self.mov(target, parent).unwrap()
234+
self.mov(target, parent)
253235
}
254236
_ => unreachable!(),
255237
}

0 commit comments

Comments
 (0)