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

refactor: replace latest_lamport with next_lamport

Browse source
This commit is contained in:
Zixuan Chen 2023-07-12 21:34:56 +08:00
parent 097d86915a
commit d3f921bae0
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
crates/loro-internal/src/refactor/oplog.rs
View file

@ -32,7 +32,7 @@ pub struct OpLog {
pub(crate) dag: AppDag, pub(crate) dag: AppDag,
pub(crate) arena: SharedArena, pub(crate) arena: SharedArena,
pub(crate) changes: ClientChanges, pub(crate) changes: ClientChanges,
pub(crate) latest_lamport: Lamport, //TODO use next lamport instead pub(crate) next_lamport: Lamport,
pub(crate) latest_timestamp: Timestamp, pub(crate) latest_timestamp: Timestamp,
/// Pending changes that haven't been applied to the dag. /// Pending changes that haven't been applied to the dag.
/// A change can be imported only when all its deps are already imported. /// A change can be imported only when all its deps are already imported.
@ -65,7 +65,7 @@ impl Clone for OpLog {
dag: self.dag.clone(), dag: self.dag.clone(),
arena: Default::default(), arena: Default::default(),
changes: self.changes.clone(), changes: self.changes.clone(),
latest_lamport: self.latest_lamport, next_lamport: self.next_lamport,
latest_timestamp: self.latest_timestamp, latest_timestamp: self.latest_timestamp,
pending_changes: Default::default(), pending_changes: Default::default(),
} }
@ -77,7 +77,7 @@ impl std::fmt::Debug for OpLog {
f.debug_struct("OpLog") f.debug_struct("OpLog")
.field("dag", &self.dag) .field("dag", &self.dag)
.field("changes", &self.changes) .field("changes", &self.changes)
.field("latest_lamport", &self.latest_lamport) .field("next_lamport", &self.next_lamport)
.field("latest_timestamp", &self.latest_timestamp) .field("latest_timestamp", &self.latest_timestamp)
.finish() .finish()
} }
@ -89,7 +89,7 @@ impl OpLog {
dag: AppDag::default(), dag: AppDag::default(),
arena: Default::default(), arena: Default::default(),
changes: ClientChanges::default(), changes: ClientChanges::default(),
latest_lamport: Lamport::default(), next_lamport: 0,
latest_timestamp: Timestamp::default(), latest_timestamp: Timestamp::default(),
pending_changes: Default::default(), pending_changes: Default::default(),
} }
@ -114,7 +114,7 @@ impl OpLog {
} }
self.dag.vv.extend_to_include_last_id(change.id_last()); self.dag.vv.extend_to_include_last_id(change.id_last());
self.latest_lamport = self.latest_lamport.max(change.lamport_last()); self.next_lamport = self.next_lamport.max(change.lamport_end());
self.latest_timestamp = self.latest_timestamp.max(change.timestamp); self.latest_timestamp = self.latest_timestamp.max(change.timestamp);
self.dag.frontiers.retain_non_included(&change.deps); self.dag.frontiers.retain_non_included(&change.deps);
self.dag.frontiers.filter_included(change.id); self.dag.frontiers.filter_included(change.id);
@ -182,7 +182,7 @@ impl OpLog {
} }
pub fn next_lamport(&self) -> Lamport { pub fn next_lamport(&self) -> Lamport {
self.latest_lamport + 1 self.next_lamport
} }
pub fn next_id(&self, peer: PeerID) -> ID { pub fn next_id(&self, peer: PeerID) -> ID {