Deuxfleurs/garage
48
55
Fork 73
Code Issues 100 Pull requests 15 Releases 30 Wiki Activity

Garage v0.9 #473

Merged
lx merged 175 commits from next into main 2023-10-10 13:28:29 +00:00
Conversation 0 Commits 175 Files changed 120 +4 -1
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit f579d6d9b4 - Show all commits

5
src/model/s3/lifecycle_worker.rs
View file

@ -193,7 +193,10 @@ impl Worker for LifecycleWorker {
if skip == Skip::SkipBucket { if skip == Skip::SkipBucket {
let bucket_id_len = object.bucket_id.as_slice().len(); let bucket_id_len = object.bucket_id.as_slice().len();
assert_eq!(pos.get(..bucket_id_len), Some(object.bucket_id.as_slice())); assert_eq!(pos.get(..bucket_id_len), Some(object.bucket_id.as_slice()));
*pos = [&pos[..bucket_id_len], &[0xFFu8][..]].concat(); *pos = std::cmp::max(
next_pos,
[&pos[..bucket_id_len], &[0xFFu8][..]].concat(),
);
} else { } else {
*pos = next_pos; *pos = next_pos;
} }