jpds/garage
1
0
Fork 0
forked from Deuxfleurs/garage
Code Issues 40 Pull requests Projects Releases Packages Wiki Activity

[refactor-block] simplify rpc_get_block

Browse source
This commit is contained in:
Alex 2024-02-23 11:47:44 +01:00
parent 9b41f4ff20
commit 07c7895948
Signed by untrusted user: lx
GPG key ID: 0E496D15096376BE
2 changed files with 4 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/block/block.rs
View file

@ -2,7 +2,7 @@ use std::path::PathBuf;
use bytes::Bytes;
use serde::{Deserialize, Serialize};
use zstd::stream::{decode_all as zstd_decode, Encoder};
use zstd::stream::Encoder;
use garage_util::data::*;
use garage_util::error::*;
@ -43,26 +43,7 @@ impl DataBlock {
res
}
/// Get the buffer, possibly decompressing it, and verify it's integrity.
/// For Plain block, data is compared to hash, for Compressed block, zstd checksumming system
/// is used instead.
pub fn verify_get(self, hash: Hash) -> Result<Bytes, Error> {
match self {
DataBlock::Plain(data) => {
if blake2sum(&data) == hash {
Ok(data)
} else {
Err(Error::CorruptData(hash))
}
}
DataBlock::Compressed(data) => zstd_decode(&data[..])
.map_err(|_| Error::CorruptData(hash))
.map(Bytes::from),
}
}
/// Verify data integrity. Allocate less than [`DataBlock::verify_get`] and don't consume self, but
/// does not return the buffer content.
/// Verify data integrity. Does not return the buffer content.
pub fn verify(&self, hash: Hash) -> Result<(), Error> {
match self {
DataBlock::Plain(data) => {

5
src/block/manager.rs
View file

@ -342,9 +342,8 @@ impl BlockManager {
hash: &Hash,
order_tag: Option<OrderTag>,
) -> Result<Bytes, Error> {
self.rpc_get_raw_block(hash, order_tag)
.await?
.verify_get(*hash)
let stream = self.rpc_get_block_streaming(hash, order_tag).await?;
Ok(read_stream_to_end(stream).await?.into_bytes())
}
/// Send block to nodes that should have it