ThetaDev/automerge
1
0
Fork 0
Code Issues Pull requests Projects Releases Activity

Move deps closer to the start of an encoded change

Browse source 
Corresponding to automerge/automerge@7d9adb4807
This commit is contained in:
Martin Kleppmann 2021-01-07 11:54:28 +00:00 • committed by Orion Henry
parent 5ec8408398
commit 13b3faf921
1 changed files with 16 additions and 19 deletions

35
automerge-backend/src/change.rs
View file

@ -72,9 +72,12 @@ impl UnencodedChange {
fn encode_chunk_body(&self) -> io::Result<Vec<u8>> {
let mut buf = Vec::new();
let mut actors = Vec::new();
actors.push(self.actor_id.clone());
let mut deps = self.deps.clone();
deps.sort_unstable();
deps.len().encode(&mut buf)?;
for hash in deps.iter() {
buf.write_all(&hash.0)?;
}
self.actor_id.to_bytes().encode(&mut buf)?;
self.seq.encode(&mut buf)?;
@ -82,17 +85,11 @@ impl UnencodedChange {
self.time.encode(&mut buf)?;
self.message.encode(&mut buf)?;
let mut actors = Vec::new();
actors.push(self.actor_id.clone());
let ops_buf = ColumnEncoder::encode_ops(&self.operations, &mut actors);
actors[1..].encode(&mut buf)?;
let mut deps = self.deps.clone();
deps.sort_unstable();
deps.len().encode(&mut buf)?;
for hash in deps.iter() {
buf.write_all(&hash.0)?;
}
buf.write_all(&ops_buf)?;
Ok(buf)
@ -160,6 +157,14 @@ impl Change {
let hash = hasher.result()[..].try_into()?;
let mut cursor = body.clone();
let mut deps = Vec::new();
let num_deps = read_slice(&bytes, &mut cursor)?;
for _ in 0..num_deps {
let hash = cursor.start..(cursor.start + HASH_BYTES);
cursor = hash.end..cursor.end;
//let hash = slice_n_bytes(bytes, HASH_BYTES)?;
deps.push(bytes[hash].try_into()?);
}
let actor = amp::ActorID::from(&bytes[slice_bytes(&bytes, &mut cursor)?]);
let seq = read_slice(&bytes, &mut cursor)?;
let start_op = read_slice(&bytes, &mut cursor)?;
@ -172,14 +177,6 @@ impl Change {
&bytes[slice_bytes(&bytes, &mut cursor)?],
));
}
let mut deps = Vec::new();
let num_deps = read_slice(&bytes, &mut cursor)?;
for _ in 0..num_deps {
let hash = cursor.start..(cursor.start + HASH_BYTES);
cursor = hash.end..cursor.end;
//let hash = slice_n_bytes(bytes, HASH_BYTES)?;
deps.push(bytes[hash].try_into()?);
}
let mut ops = HashMap::new();
let mut last_id = 0;
while !bytes[cursor.clone()].is_empty() {