From 601ae25ad27d99c524691d5284e56b2e61545979 Mon Sep 17 00:00:00 2001 From: Alex Auvolat Date: Sun, 29 Nov 2020 16:21:28 +0100 Subject: Small refactorings --- src/api/s3_put.rs | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'src') diff --git a/src/api/s3_put.rs b/src/api/s3_put.rs index a528720d..6906d758 100644 --- a/src/api/s3_put.rs +++ b/src/api/s3_put.rs @@ -51,12 +51,7 @@ pub async fn handle_put( let md5sum_arr = md5sum.finalize(); let md5sum_hex = hex::encode(md5sum_arr); - let mut sha256sum = Sha256::new(); - 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); + let sha256sum_hash = hash(&first_block[..]); ensure_checksum_matches( md5sum_arr.as_slice(), @@ -282,7 +277,6 @@ pub fn put_response(version_uuid: UUID, etag: String) -> Response { Response::builder() .header("x-amz-version-id", hex::encode(version_uuid)) .header("ETag", etag) - // TODO ETag .body(Body::from(vec![])) .unwrap() } @@ -369,7 +363,7 @@ pub async fn handle_put_part( } // 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 (_, md5sum_arr, sha256sum) = read_and_put_blocks( &garage, -- cgit v1.2.3 From fed97f37e1f0cc2ed8e06f4b76ed0cfcf4a24c97 Mon Sep 17 00:00:00 2001 From: Alex Auvolat Date: Sun, 29 Nov 2020 16:38:01 +0100 Subject: ETag patch --- src/api/s3_put.rs | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/api/s3_put.rs b/src/api/s3_put.rs index 6906d758..09c3cdbe 100644 --- a/src/api/s3_put.rs +++ b/src/api/s3_put.rs @@ -273,10 +273,10 @@ impl BodyChunker { } } -pub fn put_response(version_uuid: UUID, etag: String) -> Response { +pub fn put_response(version_uuid: UUID, md5sum_hex: String) -> Response { Response::builder() .header("x-amz-version-id", hex::encode(version_uuid)) - .header("ETag", etag) + .header("ETag", format!("\"{}\"", md5sum_hex)) .body(Body::from(vec![])) .unwrap() } @@ -382,7 +382,11 @@ pub async fn handle_put_part( content_sha256, )?; - Ok(Response::new(Body::from(vec![]))) + let response = Response::builder() + .header("ETag", format!("\"{}\"", hex::encode(md5sum_arr))) + .body(Body::from(vec![])) + .unwrap(); + Ok(response) } pub async fn handle_complete_multipart_upload( -- cgit v1.2.3 From d54f15b2c6794eacee82d3900c50dbfb086f8c79 Mon Sep 17 00:00:00 2001 From: Alex Auvolat Date: Sun, 29 Nov 2020 17:06:55 +0100 Subject: Small optimisation --- src/api/s3_put.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/api/s3_put.rs b/src/api/s3_put.rs index 09c3cdbe..9c4d625c 100644 --- a/src/api/s3_put.rs +++ b/src/api/s3_put.rs @@ -248,7 +248,7 @@ impl BodyChunker { body, read_all: false, block_size, - buf: VecDeque::new(), + buf: VecDeque::with_capacity(2 * block_size), } } async fn next(&mut self) -> Result>, GarageError> { -- cgit v1.2.3