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

fix: tracker state fix

Browse source
This commit is contained in:
Zixuan Chen 2022-10-20 14:45:56 +08:00
parent 4f2f07dd32
commit 12e2899bdd
6 changed files with 23 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
crates/loro-core/src/container/map/map_container.rs
View file

@ -99,7 +99,7 @@ impl Container for MapContainer {
ContainerType::Map
}
fn apply(&mut self, op: &OpProxy, log: &LogStore) {
fn apply(&mut self, op: &OpProxy, _log: &LogStore) {
debug_assert_eq!(&op.op().container, self.id());
match op.content() {
OpContent::Normal { content } => {

45
crates/loro-core/src/container/text/tracker.rs
View file

@ -36,9 +36,8 @@ pub mod yata_impl;
///
#[derive(Debug)]
pub struct Tracker {
// #[cfg(feature = "fuzzing")]
#[cfg(feature = "fuzzing")]
client_id: u64,
// FIXME: vv state is not up to date
/// from start_vv to latest vv are applied
start_vv: VersionVector,
/// latest applied ops version vector
@ -78,6 +77,7 @@ impl Tracker {
content,
id_to_cursor,
start_vv,
#[cfg(feature = "fuzzing")]
client_id: 0,
head_vv: Default::default(),
all_vv: Default::default(),
@ -125,27 +125,21 @@ impl Tracker {
}
fn checkout(&mut self, vv: VersionVector) {
todo!();
// let diff = self.head_vv.diff(&vv);
// self.retreat(&diff.get_id_spans_left().collect::<Vec<_>>());
// self.forward(&diff.get_id_spans_right().collect::<Vec<_>>());
// self.head_vv = vv;
let diff = self.head_vv.diff(&vv);
self.retreat(&diff.left);
self.forward(&diff.right);
self.head_vv = vv;
}
pub fn forward(&mut self, spans: &IdSpanVector) {
todo!("update vvs");
let mut to_set_as_applied = Vec::with_capacity(spans.len());
let mut to_delete = Vec::with_capacity(spans.len());
for span in spans.iter() {
let IdSpanQueryResult {
mut inserts,
deletes,
} = self.id_to_cursor.get_cursors_at_id_span(IdSpan::new(
*span.0,
span.1.start,
span.1.end,
));
for (id, delete) in deletes {
self.head_vv.set_end(ID::new(*span.0, span.1.end));
let IdSpanQueryResult { inserts, deletes } = self
.id_to_cursor
.get_cursors_at_id_span(IdSpan::new(*span.0, span.1.start, span.1.end));
for (_, delete) in deletes {
for deleted_span in delete.iter() {
to_delete.append(
&mut self
@ -176,19 +170,14 @@ impl Tracker {
}
pub fn retreat(&mut self, spans: &IdSpanVector) {
todo!("update vvs");
let mut to_set_as_future = Vec::with_capacity(spans.len());
let mut to_undo_delete = Vec::with_capacity(spans.len());
for span in spans.iter() {
let IdSpanQueryResult {
mut inserts,
deletes,
} = self.id_to_cursor.get_cursors_at_id_span(IdSpan::new(
*span.0,
span.1.start,
span.1.end,
));
for (id, delete) in deletes {
self.head_vv.set_end(ID::new(*span.0, span.1.start));
let IdSpanQueryResult { inserts, deletes } = self
.id_to_cursor
.get_cursors_at_id_span(IdSpan::new(*span.0, span.1.start, span.1.end));
for (_, delete) in deletes {
for deleted_span in delete.iter() {
to_undo_delete.append(
&mut self
@ -221,7 +210,9 @@ impl Tracker {
/// apply an operation directly to the current tracker
pub(crate) fn apply(&mut self, id: ID, content: &OpContent) {
assert_eq!(*self.head_vv.get(&id.client_id).unwrap_or(&0), id.counter);
assert_eq!(*self.all_vv.get(&id.client_id).unwrap_or(&0), id.counter);
self.head_vv.set_end(id.inc(content.len() as i32));
self.all_vv.set_end(id.inc(content.len() as i32));
match &content {
crate::op::OpContent::Normal { content } => {
let text_content = content.as_list().expect("Content is not for list");

33
crates/loro-core/src/container/text/tracker/effects_iter.rs
View file

@ -7,11 +7,7 @@ use crate::{
version::IdSpanVector,
};
use super::{
cursor_map::{FirstCursorResult, IdSpanQueryResult},
y_span::StatusChange,
Tracker,
};
use super::{cursor_map::FirstCursorResult, y_span::StatusChange, Tracker};
pub struct EffectIter<'a> {
tracker: &'a mut Tracker,
@ -34,33 +30,6 @@ impl<'a> EffectIter<'a> {
current_delete_targets: None,
}
}
fn run(tracker: &mut Tracker, spans: &IdSpanVector) {
let mut to_set_as_applied = Vec::with_capacity(spans.len());
let mut to_delete = Vec::with_capacity(spans.len());
for span in spans.iter() {
let IdSpanQueryResult {
mut inserts,
deletes,
} = tracker.id_to_cursor.get_cursors_at_id_span(IdSpan::new(
*span.0,
span.1.start,
span.1.end,
));
for (id, delete) in deletes {
for deleted_span in delete.iter() {
to_delete.append(
&mut tracker
.id_to_cursor
.get_cursors_at_id_span(*deleted_span)
.inserts,
);
}
}
to_set_as_applied.append(&mut inserts);
}
}
}
pub enum Effect {

2
crates/loro-core/src/dag/mermaid.rs
View file

@ -109,7 +109,7 @@ fn break_points_to_output(input: BreakPoints) -> Output {
fn get_dag_break_points<T: DagNode>(dag: &impl Dag<Node = T>) -> BreakPoints {
let mut break_points = BreakPoints {
vv: dag.vv().clone(),
vv: dag.vv(),
break_points: FxHashMap::default(),
links: FxHashMap::default(),
};

2
crates/loro-core/src/log_store.rs
View file

@ -10,7 +10,7 @@ use std::{
use fxhash::FxHashMap;
use rle::{HasLength, RleVec, Sliceable};
use serde::__private::de::Content;
use smallvec::SmallVec;
use crate::{

1
crates/loro-core/tests/integration.rs Normal file
View file

@ -0,0 +1 @@
use loro_core::LogStore;