Deuxfleurs/garage
46
56
Fork 73
Code Issues 100 Pull requests 14 Releases 30 Wiki Activity

WIP add content defined chunking #42

Closed
trinity-1686a wants to merge 42 commits from content-defined-chunking into master
pull from: content-defined-chunking
merge into: Deuxfleurs:master
Conversation 3 Commits 42 Files changed 60 +2 -1
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 537f652fec - Show all commits

2
src/rpc/rpc_server.rs
View file

@ -51,7 +51,7 @@ where
trace!( trace!(
"Request message: {}", "Request message: {}",
serde_json::to_string(&msg).unwrap_or("<json error>".into()) serde_json::to_string(&msg).unwrap_or("<json error>".into()).chars().take(100).collect::<String>()
); );
match handler(msg, sockaddr).await { match handler(msg, sockaddr).await {

1
src/table/merkle.rs
View file

@ -56,6 +56,7 @@ pub struct MerkleNodeKey {
pub partition: MerklePartition, pub partition: MerklePartition,
// prefix: a prefix for the hash of full keys, i.e. hash(hash(partition_key)+sort_key) // prefix: a prefix for the hash of full keys, i.e. hash(hash(partition_key)+sort_key)
#[serde(with = "serde_bytes")]
pub prefix: Vec<u8>, pub prefix: Vec<u8>,
} }