mirrors/loro
1
0
Fork 0
mirror of https://github.com/loro-dev/loro.git synced 2025-01-23 13:39:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: rm snapshot start counter

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

12
crates/loro-internal/src/log_store/encoding/encode_snapshot.rs
View file

@ -148,7 +148,6 @@ pub(super) struct SnapshotEncoded {
containers: Containers, containers: Containers,
container_states: Vec<EncodedStateContent>, container_states: Vec<EncodedStateContent>,
keys: Vec<InternalString>, keys: Vec<InternalString>,
start_counter: Vec<Counter>,
} }
const ENCODED_UNKNOWN_SLICE: i64 = -2; const ENCODED_UNKNOWN_SLICE: i64 = -2;
@ -198,13 +197,10 @@ pub(super) fn encode_snapshot(store: &LogStore, gc: bool) -> Result<Vec<u8>, Lor
let mut client_id_to_idx: FxHashMap<ClientID, ClientIdx> = FxHashMap::default(); let mut client_id_to_idx: FxHashMap<ClientID, ClientIdx> = FxHashMap::default();
let mut clients = Vec::with_capacity(store.changes.len()); let mut clients = Vec::with_capacity(store.changes.len());
let mut change_num = 0; let mut change_num = 0;
let mut start_counter = Vec::new();
for (key, changes) in store.changes.iter() { for (key, changes) in store.changes.iter() {
client_id_to_idx.insert(*key, clients.len() as ClientIdx); client_id_to_idx.insert(*key, clients.len() as ClientIdx);
clients.push(*key); clients.push(*key);
change_num += changes.merged_len(); change_num += changes.merged_len();
start_counter.push(changes.first().unwrap().id.counter);
} }
let (_, containers) = store.reg.export(); let (_, containers) = store.reg.export();
@ -286,7 +282,6 @@ pub(super) fn encode_snapshot(store: &LogStore, gc: bool) -> Result<Vec<u8>, Lor
containers, containers,
container_states, container_states,
keys, keys,
start_counter,
}; };
to_vec(&encoded).map_err(|e| LoroError::DecodeError(e.to_string().into())) to_vec(&encoded).map_err(|e| LoroError::DecodeError(e.to_string().into()))
} }
@ -306,7 +301,6 @@ pub(super) fn decode_snapshot(
containers, containers,
container_states, container_states,
keys, keys,
start_counter,
} = encoded; } = encoded;
if change_encodings.is_empty() { if change_encodings.is_empty() {
@ -329,10 +323,8 @@ pub(super) fn decode_snapshot(
container_idx2type.insert(container_idx, container_id.container_type()); container_idx2type.insert(container_idx, container_id.container_type());
} }
for (client_idx, this_change_encodings) in for (_, this_change_encodings) in &change_encodings.into_iter().group_by(|c| c.client_idx) {
&change_encodings.into_iter().group_by(|c| c.client_idx) let mut counter = 0;
{
let mut counter = start_counter[client_idx as usize];
for change_encoding in this_change_encodings { for change_encoding in this_change_encodings {
let ChangeEncoding { let ChangeEncoding {
client_idx, client_idx,