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 containerIdx with ContainerID

Browse source 
in refactor module
This commit is contained in:
Zixuan Chen 2023-07-04 12:35:34 +08:00
parent 87887b1b2c
commit b747452ced
3 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
crates/loro-internal/src/refactor/arena.rs
View file

@ -8,8 +8,6 @@ use crate::container::{ContainerID, ContainerIdx};
///
#[derive(Clone)]
pub(super) struct SharedArena {
containers: Vector<ContainerID>,
id_to_idx: im::HashMap<ContainerID, ContainerIdx>,
/// The parent of each container.
parents: Vector<Option<ContainerIdx>>,
parents: im::HashMap<ContainerID, ContainerID>,
}

4
crates/loro-internal/src/refactor/diff_calc.rs
View file

@ -1,12 +1,12 @@
use fxhash::FxHashMap;
use crate::container::ContainerIdx;
use crate::container::{ContainerID, ContainerIdx};
/// Calculate the diff between two versions. given [OpLog][super::oplog::OpLog]
/// and [AppState][super::state::AppState].
#[derive(Default)]
pub(super) struct DiffCalculator {
calc: FxHashMap<ContainerIdx, ContainerDiffCalculator>,
calc: FxHashMap<ContainerID, ContainerDiffCalculator>,
}
impl DiffCalculator {
pub(crate) fn calc(

11
crates/loro-internal/src/refactor/state.rs
View file

@ -1,7 +1,12 @@
use enum_dispatch::enum_dispatch;
use fxhash::FxHashMap;
use crate::{container::ContainerIdx, event::Diff, version::Frontiers, VersionVector};
use crate::{
container::{ContainerID, ContainerIdx},
event::Diff,
version::Frontiers,
VersionVector,
};
use super::arena::SharedArena;
@ -17,7 +22,7 @@ use text_state::TextState;
pub struct AppState {
vv: VersionVector,
frontiers: Frontiers,
state: FxHashMap<ContainerIdx, State>,
state: FxHashMap<ContainerID, State>,
arena: SharedArena,
}
@ -39,6 +44,6 @@ pub struct AppStateDiff {
}
pub struct ContainerStateDiff {
pub idx: ContainerIdx,
pub idx: ContainerID,
pub diff: Diff,
}