gsadmin/noq
1
0
Fork 0
mirror of https://github.com/n0-computer/noq.git synced 2026-09-23 19:48:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

handle overlapping chunks during defragment

Browse Source
This commit is contained in:
alecmocatta
2020-03-09 22:51:20 +00:00
committed by Dirkjan Ochtman
parent e2618ef99a
commit 942bb77e72
1 changed files with 70 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quinn-proto/src/assembler.rs
+70 -2
View File
@@ -86,12 +86,17 @@ impl Assembler {
let new = BinaryHeap::with_capacity(self.data.len());
let old = mem::replace(&mut self.data, new);
for chunk in old.into_sorted_vec().into_iter().rev() {
if offset + (buffer.len() as u64) < chunk.offset {
let end = offset + (buffer.len() as u64);
if let Some(overlap) = end.checked_sub(chunk.offset) {
if let Some(bytes) = chunk.bytes.get(overlap as usize..) {
buffer.extend_from_slice(bytes);
}
} else {
let bytes = buffer.split().freeze();
self.data.push(Chunk { offset, bytes });
offset = chunk.offset;
buffer.extend_from_slice(&chunk.bytes);
}
buffer.extend_from_slice(&chunk.bytes);
}
let bytes = buffer.split().freeze();
@@ -210,6 +215,16 @@ mod test {
assert_matches!(x.next(32), None);
}
#[test]
fn assemble_duplicate_compact() {
let mut x = Assembler::new();
x.insert(0, Bytes::from_static(b"123"));
x.insert(0, Bytes::from_static(b"123"));
x.defragment();
assert_matches!(x.next(32), Some(ref y) if &y[..] == b"123");
assert_matches!(x.next(32), None);
}
#[test]
fn assemble_contained() {
let mut x = Assembler::new();
@@ -219,6 +234,16 @@ mod test {
assert_matches!(x.next(32), None);
}
#[test]
fn assemble_contained_compact() {
let mut x = Assembler::new();
x.insert(0, Bytes::from_static(b"12345"));
x.insert(1, Bytes::from_static(b"234"));
x.defragment();
assert_matches!(x.next(32), Some(ref y) if &y[..] == b"12345");
assert_matches!(x.next(32), None);
}
#[test]
fn assemble_contains() {
let mut x = Assembler::new();
@@ -228,6 +253,16 @@ mod test {
assert_matches!(x.next(32), None);
}
#[test]
fn assemble_contains_compact() {
let mut x = Assembler::new();
x.insert(1, Bytes::from_static(b"234"));
x.insert(0, Bytes::from_static(b"12345"));
x.defragment();
assert_matches!(x.next(32), Some(ref y) if &y[..] == b"12345");
assert_matches!(x.next(32), None);
}
#[test]
fn assemble_overlapping() {
let mut x = Assembler::new();
@@ -237,6 +272,16 @@ mod test {
assert_matches!(x.next(32), None);
}
#[test]
fn assemble_overlapping_compact() {
let mut x = Assembler::new();
x.insert(0, Bytes::from_static(b"123"));
x.insert(1, Bytes::from_static(b"234"));
x.defragment();
assert_matches!(x.next(32), Some(ref y) if &y[..] == b"1234");
assert_matches!(x.next(32), None);
}
#[test]
fn assemble_complex() {
let mut x = Assembler::new();
@@ -248,6 +293,18 @@ mod test {
assert_matches!(x.next(32), None);
}
#[test]
fn assemble_complex_compact() {
let mut x = Assembler::new();
x.insert(0, Bytes::from_static(b"1"));
x.insert(2, Bytes::from_static(b"3"));
x.insert(4, Bytes::from_static(b"5"));
x.insert(0, Bytes::from_static(b"123456"));
x.defragment();
assert_matches!(x.next(32), Some(ref y) if &y[..] == b"123456");
assert_matches!(x.next(32), None);
}
#[test]
fn assemble_old() {
let mut x = Assembler::new();
@@ -257,6 +314,17 @@ mod test {
assert_matches!(x.next(32), None);
}
#[test]
fn assemble_old_compact() {
let mut x = Assembler::new();
x.insert(0, Bytes::from_static(b"1234"));
x.defragment();
assert_matches!(x.next(32), Some(ref y) if &y[..] == b"1234");
x.insert(0, Bytes::from_static(b"1234"));
x.defragment();
assert_matches!(x.next(32), None);
}
#[test]
fn compact() {
let mut x = Assembler::new();