mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2024-12-28 23:55:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

index: clarify parent entries are global positions

Browse source 
I'm going to add change id overflow table whose elements are of LocalPosition
type. Let's make sure that the serialization code would break if we changed
the underlying data type.
This commit is contained in:
Yuya Nishihara 2024-02-11 15:59:33 +09:00
parent fb10e3f296
commit 9974a46327
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
lib/src/default_index/mutable.rs
View file

@ -203,16 +203,16 @@ impl MutableIndexSegment {
buf.extend((!0_u32).to_le_bytes());
buf.extend((!0_u32).to_le_bytes());
}
[pos1] => {
assert!(pos1.0 < OVERFLOW_FLAG);
buf.extend(pos1.0.to_le_bytes());
[IndexPosition(pos1)] => {
assert!(*pos1 < OVERFLOW_FLAG);
buf.extend(pos1.to_le_bytes());
buf.extend((!0_u32).to_le_bytes());
}
[pos1, pos2] => {
assert!(pos1.0 < OVERFLOW_FLAG);
assert!(pos2.0 < OVERFLOW_FLAG);
buf.extend(pos1.0.to_le_bytes());
buf.extend(pos2.0.to_le_bytes());
[IndexPosition(pos1), IndexPosition(pos2)] => {
assert!(*pos1 < OVERFLOW_FLAG);
assert!(*pos2 < OVERFLOW_FLAG);
buf.extend(pos1.to_le_bytes());
buf.extend(pos2.to_le_bytes());
}
positions => {
let overflow_pos = u32::try_from(parent_overflow.len()).unwrap();
@ -237,10 +237,10 @@ impl MutableIndexSegment {
buf.extend(pos.to_le_bytes());
}
buf[parent_overflow_offset..][..4]
.copy_from_slice(&u32::try_from(parent_overflow.len()).unwrap().to_le_bytes());
for parent_pos in parent_overflow {
buf.extend(parent_pos.0.to_le_bytes());
let num_parent_overflow = u32::try_from(parent_overflow.len()).unwrap();
buf[parent_overflow_offset..][..4].copy_from_slice(&num_parent_overflow.to_le_bytes());
for IndexPosition(pos) in parent_overflow {
buf.extend(pos.to_le_bytes());
}
}