Deuxfleurs/garage
44
56
Fork 74
Code Issues 100 Pull requests 14 Releases 30 Wiki Activity

remove size limitation in copy #280

Merged
lx merged 2 commits from withinboredom/garage:main into main 2022-04-19 10:49:44 +00:00
Conversation 12 Commits 2 Files changed 1 -5
1 changed files with 0 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 2a1f2138df - Show all commits

5
src/api/s3_copy.rs
View file

@ -268,7 +268,6 @@ pub async fn handle_upload_part_copy(
let mut blocks_to_copy = vec![]; let mut blocks_to_copy = vec![];
let mut current_offset = 0; let mut current_offset = 0;
let mut size_to_copy = 0;
for (_bk, block) in source_version.blocks.items().iter() { for (_bk, block) in source_version.blocks.items().iter() {
let (block_begin, block_end) = (current_offset, current_offset + block.size); let (block_begin, block_end) = (current_offset, current_offset + block.size);
@ -289,10 +288,6 @@ pub async fn handle_upload_part_copy(
(Some(b), None) => Some(b as usize..block.size as usize), (Some(b), None) => Some(b as usize..block.size as usize),
(None, None) => None, (None, None) => None,
}; };
size_to_copy += range_to_copy
.as_ref()
.map(|x| x.len() as u64)
.unwrap_or(block.size);
blocks_to_copy.push((block.hash, range_to_copy)); blocks_to_copy.push((block.hash, range_to_copy));
} }