Store only max undo by replica instead of individual undos in Fragment

This commit is contained in:
Antonio Scandurra 2021-04-09 11:02:46 +02:00
parent 7b6fbe1d89
commit 2e7ca8ea46
2 changed files with 26 additions and 16 deletions

View file

@ -177,7 +177,7 @@ struct Fragment {
insertion: Insertion, insertion: Insertion,
text: Text, text: Text,
deletions: HashSet<time::Local>, deletions: HashSet<time::Local>,
undos: HashSet<time::Local>, max_undos: time::Global,
visible: bool, visible: bool,
} }
@ -272,8 +272,8 @@ impl Buffer {
id: FragmentId::min_value().clone(), id: FragmentId::min_value().clone(),
insertion: base_insertion.clone(), insertion: base_insertion.clone(),
text: base_insertion.text.slice(0..0), text: base_insertion.text.slice(0..0),
deletions: HashSet::default(), deletions: Default::default(),
undos: HashSet::default(), max_undos: Default::default(),
visible: true, visible: true,
}); });
@ -292,8 +292,8 @@ impl Buffer {
id: base_fragment_id, id: base_fragment_id,
text: base_insertion.text.clone(), text: base_insertion.text.clone(),
insertion: base_insertion, insertion: base_insertion,
deletions: HashSet::default(), deletions: Default::default(),
undos: HashSet::default(), max_undos: Default::default(),
visible: true, visible: true,
}); });
} }
@ -979,7 +979,7 @@ impl Buffer {
loop { loop {
let mut fragment = cursor.item().unwrap().clone(); let mut fragment = cursor.item().unwrap().clone();
fragment.visible = fragment.is_visible(&self.undo_map); fragment.visible = fragment.is_visible(&self.undo_map);
fragment.undos.insert(undo.id); fragment.max_undos.observe(undo.id);
new_fragments.push(fragment); new_fragments.push(fragment);
cursor.next(); cursor.next();
if let Some(split_id) = insertion_splits.next() { if let Some(split_id) = insertion_splits.next() {
@ -1000,7 +1000,7 @@ impl Buffer {
|| fragment.insertion.id == undo.edit_id || fragment.insertion.id == undo.edit_id
{ {
fragment.visible = fragment.is_visible(&self.undo_map); fragment.visible = fragment.is_visible(&self.undo_map);
fragment.undos.insert(undo.id); fragment.max_undos.observe(undo.id);
} }
new_fragments.push(fragment); new_fragments.push(fragment);
cursor.next(); cursor.next();
@ -1925,8 +1925,8 @@ impl Fragment {
id, id,
text: insertion.text.clone(), text: insertion.text.clone(),
insertion, insertion,
deletions: HashSet::default(), deletions: Default::default(),
undos: HashSet::default(), max_undos: Default::default(),
visible: true, visible: true,
} }
} }
@ -1989,9 +1989,7 @@ impl sum_tree::Item for Fragment {
for deletion in &self.deletions { for deletion in &self.deletions {
max_version.observe(*deletion); max_version.observe(*deletion);
} }
for undo in &self.undos { max_version.observe_all(&self.max_undos);
max_version.observe(*undo);
}
if self.visible { if self.visible {
FragmentSummary { FragmentSummary {

View file

@ -4,6 +4,8 @@ use std::mem;
use std::ops::{Add, AddAssign}; use std::ops::{Add, AddAssign};
use std::sync::Arc; use std::sync::Arc;
use lazy_static::lazy_static;
pub type ReplicaId = u16; pub type ReplicaId = u16;
pub type Seq = u64; pub type Seq = u64;
@ -13,9 +15,6 @@ pub struct Local {
pub value: Seq, pub value: Seq,
} }
#[derive(Clone, Debug, Eq, PartialEq)]
pub struct Global(Arc<HashMap<ReplicaId, u64>>);
#[derive(Clone, Copy, Debug, Default, Eq, Hash, Ord, PartialEq, PartialOrd)] #[derive(Clone, Copy, Debug, Default, Eq, Hash, Ord, PartialEq, PartialOrd)]
pub struct Lamport { pub struct Lamport {
pub value: Seq, pub value: Seq,
@ -59,9 +58,22 @@ impl<'a> AddAssign<&'a Local> for Local {
} }
} }
#[derive(Clone, Debug, Eq, PartialEq)]
pub struct Global(Arc<HashMap<ReplicaId, u64>>);
lazy_static! {
static ref DEFAULT_GLOBAL: Global = Global(Arc::new(HashMap::new()));
}
impl Default for Global {
fn default() -> Self {
DEFAULT_GLOBAL.clone()
}
}
impl Global { impl Global {
pub fn new() -> Self { pub fn new() -> Self {
Global(Arc::new(HashMap::new())) Self::default()
} }
pub fn get(&self, replica_id: ReplicaId) -> Seq { pub fn get(&self, replica_id: ReplicaId) -> Seq {