Deuxfleurs/garage
41
56
Fork 73
Code Issues 102 Pull requests 14 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 +5 -4
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 4b4f2000f4 - Show all commits

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

@ -192,11 +192,12 @@ impl Worker for LifecycleWorker {
*counter += 1; *counter += 1;
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 = std::cmp::max( next_pos.get(..bucket_id_len),
next_pos, Some(object.bucket_id.as_slice())
[&pos[..bucket_id_len], &[0xFFu8][..]].concat(),
); );
let last_bucket_pos = [&next_pos[..bucket_id_len], &[0xFFu8][..]].concat();
*pos = std::cmp::max(next_pos, last_bucket_pos);
} else { } else {
*pos = next_pos; *pos = next_pos;
} }