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

fix: lookup change

Browse source
This commit is contained in:
leeeon233 2023-02-17 12:02:59 +08:00 committed by Leonzhao
parent 1743f4af42
commit f0266f015f
2 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
crates/loro-internal/src/log_store.rs
View file

@ -101,9 +101,13 @@ impl LogStore {
#[inline]
pub fn lookup_change(&self, id: ID) -> Option<&Change> {
self.changes
.get(&id.client_id)
.map(|changes| changes.get(id.counter as usize).unwrap().element)
self.changes.get(&id.client_id).and_then(|changes| {
if id.counter <= changes.last().unwrap().id_last().counter {
Some(changes.get(id.counter as usize).unwrap().element)
} else {
None
}
})
}
pub fn export(&self, remote_vv: &VersionVector) -> FxHashMap<ClientID, Vec<Change<RemoteOp>>> {

7
crates/loro-internal/src/log_store/encoding/encode_changes.rs
View file

@ -374,10 +374,9 @@ pub(crate) fn get_lamport_by_deps(
) -> Result<Lamport, ClientID> {
let mut ans = Vec::new();
for id in deps.iter() {
if let Some(c) = store.and_then(|x|x.lookup_change(*id)) {
let offset = id.counter - c.id.counter;
ans.push(c.lamport + offset as u32);
}
if let Some(c) = store.and_then(|x| x.lookup_change(*id)) {
let offset = id.counter - c.id.counter;
ans.push(c.lamport + offset as u32);
} else if let Some(v) = lamport_map.get(&id.client_id) {
if let Some((lamport, offset)) = get_value_from_range_map(v, id.counter) {
ans.push(lamport + offset);