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

fix: rename has global index

Browse source
This commit is contained in:
Zixuan Chen 2022-10-24 11:47:06 +08:00
parent d69eca5dc5
commit 7e5c9b0b0f
2 changed files with 23 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
crates/rle/src/range_map.rs
View file

@ -2,23 +2,23 @@ use std::fmt::Debug;
use crate::{
rle_trait::ZeroElement,
rle_tree::tree_trait::{GlobalIndex, GlobalTreeTrait, HasGlobalIndex},
rle_tree::tree_trait::{GlobalIndex, GlobalTreeTrait, HasIndex},
HasLength, Mergable, Rle, RleTree, Sliceable,
};
#[derive(Debug, Clone)]
pub(crate) struct WithGlobalIndex<Value, Index: GlobalIndex> {
pub(crate) struct WithIndex<Value, Index: GlobalIndex> {
pub(crate) value: Value,
pub(crate) index: Index,
}
impl<Value: Rle, Index: GlobalIndex> HasLength for WithGlobalIndex<Value, Index> {
impl<Value: Rle, Index: GlobalIndex> HasLength for WithIndex<Value, Index> {
fn len(&self) -> usize {
self.value.len()
}
}
impl<Value: Rle, Index: GlobalIndex> Sliceable for WithGlobalIndex<Value, Index> {
impl<Value: Rle, Index: GlobalIndex> Sliceable for WithIndex<Value, Index> {
fn slice(&self, from: usize, to: usize) -> Self {
Self {
value: self.value.slice(from, to),
@ -27,7 +27,7 @@ impl<Value: Rle, Index: GlobalIndex> Sliceable for WithGlobalIndex<Value, Index>
}
}
impl<Value: Rle, Index: GlobalIndex> Mergable for WithGlobalIndex<Value, Index> {
impl<Value: Rle, Index: GlobalIndex> Mergable for WithIndex<Value, Index> {
fn is_mergable(&self, other: &Self, conf: &()) -> bool {
self.value.is_mergable(&other.value, conf)
&& self.index + Index::from_usize(self.value.len()).unwrap() == other.index
@ -38,10 +38,10 @@ impl<Value: Rle, Index: GlobalIndex> Mergable for WithGlobalIndex<Value, Index>
}
}
impl<Value: Rle, Index: GlobalIndex> HasGlobalIndex for WithGlobalIndex<Value, Index> {
impl<Value: Rle, Index: GlobalIndex> HasIndex for WithIndex<Value, Index> {
type Int = Index;
fn get_global_start(&self) -> Self::Int {
fn get_start_index(&self) -> Self::Int {
self.index
}
}
@ -49,8 +49,7 @@ impl<Value: Rle, Index: GlobalIndex> HasGlobalIndex for WithGlobalIndex<Value, I
#[repr(transparent)]
#[derive(Debug)]
pub struct RangeMap<Index: GlobalIndex + 'static, Value: Rle + ZeroElement + 'static> {
pub(crate) tree:
RleTree<WithGlobalIndex<Value, Index>, GlobalTreeTrait<WithGlobalIndex<Value, Index>, 10>>,
pub(crate) tree: RleTree<WithIndex<Value, Index>, GlobalTreeTrait<WithIndex<Value, Index>, 10>>,
}
impl<Index: GlobalIndex + 'static, Value: Rle + ZeroElement + 'static> Default
@ -71,7 +70,7 @@ impl<Index: GlobalIndex + 'static, Value: Rle + ZeroElement + 'static> RangeMap<
);
self.tree.insert(
start,
WithGlobalIndex {
WithIndex {
value,
index: start,
},

30
crates/rle/src/rle_tree/tree_trait.rs
View file

@ -246,13 +246,13 @@ pub trait GlobalIndex:
impl<T: Debug + Integer + Copy + Default + FromPrimitive + AsPrimitive<usize>> GlobalIndex for T {}
pub trait HasGlobalIndex: HasLength {
pub trait HasIndex: HasLength {
type Int: GlobalIndex;
fn get_global_start(&self) -> Self::Int;
fn get_start_index(&self) -> Self::Int;
#[inline]
fn get_global_end(&self) -> Self::Int {
self.get_global_start() + Self::Int::from_usize(self.len()).unwrap()
fn get_end_index(&self) -> Self::Int {
self.get_start_index() + Self::Int::from_usize(self.len()).unwrap()
}
}
@ -263,7 +263,7 @@ pub struct Cache<I> {
}
#[inline]
fn get_cache<T: Rle + HasGlobalIndex, const MAX_CHILD: usize>(
fn get_cache<T: Rle + HasIndex, const MAX_CHILD: usize>(
node: &Node<'_, T, GlobalTreeTrait<T, MAX_CHILD>>,
) -> Cache<T::Int> {
match node {
@ -272,9 +272,7 @@ fn get_cache<T: Rle + HasGlobalIndex, const MAX_CHILD: usize>(
}
}
impl<T: Rle + HasGlobalIndex, const MAX_CHILD: usize> RleTreeTrait<T>
for GlobalTreeTrait<T, MAX_CHILD>
{
impl<T: Rle + HasIndex, const MAX_CHILD: usize> RleTreeTrait<T> for GlobalTreeTrait<T, MAX_CHILD> {
const MAX_CHILDREN_NUM: usize = MAX_CHILD;
const MIN_CHILDREN_NUM: usize = Self::MAX_CHILDREN_NUM / 2;
@ -294,10 +292,10 @@ impl<T: Rle + HasGlobalIndex, const MAX_CHILD: usize> RleTreeTrait<T>
node.cache.end = node
.children()
.iter()
.map(|x| x.get_global_end())
.map(|x| x.get_end_index())
.max()
.unwrap();
node.cache.start = node.children()[0].get_global_start();
node.cache.start = node.children()[0].get_start_index();
}
fn update_cache_internal(node: &mut InternalNode<'_, T, Self>) {
@ -347,8 +345,8 @@ impl<T: Rle + HasGlobalIndex, const MAX_CHILD: usize> RleTreeTrait<T>
fn find_pos_leaf(node: &LeafNode<'_, T, Self>, index: Self::Int) -> FindPosResult<usize> {
for (i, child) in node.children().iter().enumerate() {
let cache = Cache {
start: child.get_global_start(),
end: child.get_global_end(),
start: child.get_start_index(),
end: child.get_end_index(),
};
if index <= cache.end {
@ -359,7 +357,7 @@ impl<T: Rle + HasGlobalIndex, const MAX_CHILD: usize> RleTreeTrait<T>
// prefer Start than End
if index == cache.end
&& i + 1 < node.children.len()
&& index == node.children[i + 1].get_global_start()
&& index == node.children[i + 1].get_start_index()
{
return FindPosResult::new(i + 1, 0, Position::Start);
}
@ -392,11 +390,11 @@ impl<T: Rle + HasGlobalIndex, const MAX_CHILD: usize> RleTreeTrait<T>
node.cache.end,
node.children()
.iter()
.map(|x| x.get_global_end())
.map(|x| x.get_end_index())
.max()
.unwrap()
);
assert_eq!(node.cache.start, node.children()[0].get_global_start());
assert_eq!(node.cache.start, node.children()[0].get_start_index());
}
fn check_cache_internal(node: &InternalNode<'_, T, Self>) {
@ -412,7 +410,7 @@ impl<T: Rle + HasGlobalIndex, const MAX_CHILD: usize> RleTreeTrait<T>
}
fn get_index(node: &LeafNode<'_, T, Self>, child_index: usize) -> Self::Int {
node.children[child_index].get_global_start()
node.children[child_index].get_start_index()
}
}