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

perf(rle): use simple iter range for range_map

Browse source
This commit is contained in:
Zixuan Chen 2022-12-09 01:12:31 +08:00
parent bc57f01e18
commit 569cfdcf5e
2 changed files with 29 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -19,7 +19,7 @@ use super::{
Tracker, Tracker,
}; };
// TODO: may use a simpler data structure here // TODO: maybe we can opt this
#[derive(Default, Debug)] #[derive(Default, Debug)]
pub struct OpSpanSet { pub struct OpSpanSet {
map: Vec<Range<u128>>, map: Vec<Range<u128>>,

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

@ -1,4 +1,4 @@
use std::{fmt::Debug, ptr::NonNull}; use std::{cell::RefCell, fmt::Debug, ptr::NonNull, rc::Rc};
use fxhash::{FxHashMap, FxHashSet}; use fxhash::{FxHashMap, FxHashSet};
@ -7,7 +7,7 @@ use crate::{
rle_tree::{ rle_tree::{
node::{InternalNode, LeafNode}, node::{InternalNode, LeafNode},
tree_trait::GlobalTreeTrait, tree_trait::GlobalTreeTrait,
Arena, HeapMode, UnsafeCursor, VecTrait, Arena, HeapMode, SafeCursor, UnsafeCursor, VecTrait,
}, },
HasLength, Mergable, Rle, RleTree, Sliceable, HasLength, Mergable, Rle, RleTree, Sliceable,
}; };
@ -328,9 +328,7 @@ impl<
/// Note that the returned values may exceed the given range /// Note that the returned values may exceed the given range
#[inline] #[inline]
pub fn get_range(&self, start: Index, end: Index) -> impl Iterator<Item = &Value> { pub fn get_range(&self, start: Index, end: Index) -> impl Iterator<Item = &Value> {
self.tree self.iter_range(start, end).map(|(_, b)| b)
.iter_range(start, Some(end))
.map(|x| &x.as_tree_ref().value)
} }
/// Return the values overlap with the given range and their indexes /// Return the values overlap with the given range and their indexes
@ -344,10 +342,7 @@ impl<
start: Index, start: Index,
end: Index, end: Index,
) -> impl Iterator<Item = (Index, &Value)> { ) -> impl Iterator<Item = (Index, &Value)> {
self.tree.iter_range(start, Some(end)).map(|x| { self.iter_range(start, end)
let x = x.as_tree_ref();
(x.index, &x.value)
})
} }
/// Return the values contained by the given range, the returned values are sliced by the given range /// Return the values contained by the given range, the returned values are sliced by the given range
@ -397,6 +392,30 @@ impl<
} }
} }
pub fn iter_range(&self, start: Index, end: Index) -> impl Iterator<Item = (Index, &Value)> {
let mut cursor = if start < end {
self.tree.get_cursor_ge(start)
} else {
None
};
std::iter::from_fn(move || loop {
if let Some(inner) = std::mem::take(&mut cursor) {
cursor = inner.next_elem_start();
let item = inner.as_tree_ref();
if item.get_end_index() <= start {
continue;
} else if item.index >= end {
return None;
} else {
let ans = (item.index, &item.value);
return Some(ans);
}
} else {
return None;
}
})
}
#[inline] #[inline]
pub fn has(&self, index: Index) -> bool { pub fn has(&self, index: Index) -> bool {
self.get(index).is_some() self.get(index).is_some()