mirrors/garage
1
0
Fork 0
mirror of https://git.deuxfleurs.fr/Deuxfleurs/garage.git synced 2024-11-25 09:31:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

Small refactorings

Browse source
This commit is contained in:
Alex Auvolat 2020-11-29 16:21:28 +01:00
parent ba1f8060fe
commit 601ae25ad2
1 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/api/s3_put.rs
View file

@ -51,12 +51,7 @@ pub async fn handle_put(
let md5sum_arr = md5sum.finalize(); let md5sum_arr = md5sum.finalize();
let md5sum_hex = hex::encode(md5sum_arr); let md5sum_hex = hex::encode(md5sum_arr);
let mut sha256sum = Sha256::new(); let sha256sum_hash = hash(&first_block[..]);
sha256sum.input(&first_block[..]);
let sha256sum_arr = sha256sum.result();
let mut hash = [0u8; 32];
hash.copy_from_slice(&sha256sum_arr[..]);
let sha256sum_hash = Hash::from(hash);
ensure_checksum_matches( ensure_checksum_matches(
md5sum_arr.as_slice(), md5sum_arr.as_slice(),
@ -282,7 +277,6 @@ pub fn put_response(version_uuid: UUID, etag: String) -> Response<Body> {
Response::builder() Response::builder()
.header("x-amz-version-id", hex::encode(version_uuid)) .header("x-amz-version-id", hex::encode(version_uuid))
.header("ETag", etag) .header("ETag", etag)
// TODO ETag
.body(Body::from(vec![])) .body(Body::from(vec![]))
.unwrap() .unwrap()
} }
@ -369,7 +363,7 @@ pub async fn handle_put_part(
} }
// Copy block to store // Copy block to store
let version = Version::new(version_uuid, bucket.into(), key.into(), false, vec![]); let version = Version::new(version_uuid, bucket, key, false, vec![]);
let first_block_hash = hash(&first_block[..]); let first_block_hash = hash(&first_block[..]);
let (_, md5sum_arr, sha256sum) = read_and_put_blocks( let (_, md5sum_arr, sha256sum) = read_and_put_blocks(
&garage, &garage,