gsadmin/garage
1
0
Fork 0
mirror of https://github.com/deuxfleurs-org/garage.git synced 2026-08-22 02:36:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

object_table: merge checksum_algorithm and checksum_type for Uploading state

Browse Source
This commit is contained in:
Alex Auvolat
2025-05-22 16:20:58 +02:00
parent e475c7f802
commit fbb40c4ea0
5 changed files with 39 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/api/s3/copy.rs
+2 -3
View File
@@ -265,7 +265,6 @@ async fn handle_copy_metaonly(
state: ObjectVersionState::Uploading {
encryption: new_meta.encryption.clone(),
checksum_algorithm: None,
checksum_type: None,
multipart: false,
},
};
@@ -531,7 +530,7 @@ pub async fn handle_upload_part_copy(
// Now, actually copy the blocks
let mut checksummer = Checksummer::init(&Default::default(), !dest_encryption.is_encrypted())
.add(dest_object_checksum_algorithm);
.add(dest_object_checksum_algorithm.map(|(algo, _)| algo));
// First, create a stream that is able to read the source blocks
// and extract the subrange if necessary.
@@ -662,7 +661,7 @@ pub async fn handle_upload_part_copy(
let checksums = checksummer.finalize();
let etag = dest_encryption.etag_from_md5(&checksums.md5);
let checksum = checksums.extract(dest_object_checksum_algorithm);
let checksum = checksums.extract(dest_object_checksum_algorithm.map(|(algo, _)| algo));
// Put the part's ETag in the Versiontable
dest_mpu.parts.put(