From f1bebda7132771fd6d6fc16782667460734260e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arpad=20M=C3=BCller?= Date: Fri, 14 Jun 2024 23:57:33 +0200 Subject: [PATCH] Fix failing test --- pageserver/src/tenant/blob_io.rs | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/pageserver/src/tenant/blob_io.rs b/pageserver/src/tenant/blob_io.rs index 6a37333084..4c2cb4c23a 100644 --- a/pageserver/src/tenant/blob_io.rs +++ b/pageserver/src/tenant/blob_io.rs @@ -325,7 +325,7 @@ impl BlobWriter { encoder.shutdown().await.unwrap(); let compressed = encoder.into_inner(); if compressed.len() < len { - let compressed_len = len; + let compressed_len = compressed.len(); compressed_buf = Some(compressed); (BYTE_ZSTD, compressed_len, slice.into_inner()) } else { @@ -336,7 +336,7 @@ impl BlobWriter { let slice = srcbuf.slice(..); let compressed = lz4_flex::block::compress(&slice[..]); if compressed.len() < len { - let compressed_len = len; + let compressed_len = compressed.len(); compressed_buf = Some(compressed); (BYTE_LZ4, compressed_len, slice.into_inner()) } else { @@ -418,8 +418,22 @@ mod tests { for blob in blobs.iter() { let (_, res) = match COMPRESSION { 0 => wtr.write_blob(blob.clone(), &ctx).await, - 1 => wtr.write_blob_compressed(blob.clone(), &ctx, Some(ImageCompressionAlgorithm::ZstdLow)).await, - 2 => wtr.write_blob_compressed(blob.clone(), &ctx, Some(ImageCompressionAlgorithm::LZ4)).await, + 1 => { + wtr.write_blob_compressed( + blob.clone(), + &ctx, + Some(ImageCompressionAlgorithm::ZstdLow), + ) + .await + } + 2 => { + wtr.write_blob_compressed( + blob.clone(), + &ctx, + Some(ImageCompressionAlgorithm::LZ4), + ) + .await + } _ => unreachable!("Invalid compression {COMPRESSION}"), }; let offs = res?;