From 152e8238d7eddf9e753609accb2dd44cacdd2825 Mon Sep 17 00:00:00 2001 From: Kryesh <28243483+kryesh@users.noreply.github.com> Date: Wed, 18 May 2022 19:49:10 +1000 Subject: [PATCH] Fix silly errors from running tests without feature flag --- src/store/compression_zstd_block.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/store/compression_zstd_block.rs b/src/store/compression_zstd_block.rs index f4ac7f7b4..23ac6b40f 100644 --- a/src/store/compression_zstd_block.rs +++ b/src/store/compression_zstd_block.rs @@ -9,7 +9,7 @@ pub fn compress(uncompressed: &[u8], compressed: &mut Vec) -> io::Result<()> let count_size = std::mem::size_of::(); - let max_size: usize = zstd::compress_bound(uncompressed.len()) + count_size; + let max_size: usize = zstd::zstd_safe::compress_bound(uncompressed.len()) + count_size; compressed.resize(max_size, 0); @@ -32,7 +32,7 @@ pub fn decompress(compressed: &[u8], decompressed: &mut Vec) -> io::Result<( let count_size = std::mem::size_of::(); - let uncompressed_size_bytes: &[u8; count_size] = compressed + let uncompressed_size_bytes: &[u8; 8] = compressed .get(..count_size) .ok_or(io::ErrorKind::InvalidData)? .try_into() @@ -40,11 +40,11 @@ pub fn decompress(compressed: &[u8], decompressed: &mut Vec) -> io::Result<( let uncompressed_size = u64::from_le_bytes(*uncompressed_size_bytes); - decompressed.resize(uncompressed_size, 0); + decompressed.resize(uncompressed_size as usize, 0); let decompressed_size = decompress_to_buffer(&compressed[count_size..], decompressed) .map_err(|err| io::Error::new(io::ErrorKind::InvalidData, err.to_string()))?; - if decompressed_size != uncompressed_size { + if decompressed_size != uncompressed_size as usize { return Err(io::Error::new( io::ErrorKind::InvalidData, "doc store block not completely decompressed, data corruption".to_string(),