jleony/nanoreth
1
0
Fork 0
mirror of https://github.com/hl-archive-node/nanoreth.git synced 2025-12-06 19:09:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: share decompressor buffer (#5777)

Browse Source
This commit is contained in:
joshieDo
2023-12-18 10:42:48 +00:00
committed by GitHub
parent 43f29fe7c2
commit 1d25829f2e
3 changed files with 43 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
crates/primitives/src/compression/mod.rs
View File

@ -16,10 +16,9 @@ thread_local! {
);
/// Thread Transaction decompressor.
pub static TRANSACTION_DECOMPRESSOR: RefCell<Decompressor<'static>> = RefCell::new(
Decompressor::with_dictionary(TRANSACTION_DICTIONARY)
.expect("Failed to initialize decompressor."),
);
pub static TRANSACTION_DECOMPRESSOR: RefCell<ReusableDecompressor> = RefCell::new(
ReusableDecompressor::new(Decompressor::with_dictionary(TRANSACTION_DICTIONARY).expect("Failed to initialize decompressor."))
);
/// Thread receipt compressor.
pub static RECEIPT_COMPRESSOR: RefCell<Compressor<'static>> = RefCell::new(
@ -28,8 +27,38 @@ thread_local! {
);
/// Thread receipt decompressor.
pub static RECEIPT_DECOMPRESSOR: RefCell<Decompressor<'static>> = RefCell::new(
Decompressor::with_dictionary(RECEIPT_DICTIONARY)
.expect("Failed to initialize decompressor."),
);
pub static RECEIPT_DECOMPRESSOR: RefCell<ReusableDecompressor> = RefCell::new(
ReusableDecompressor::new(Decompressor::with_dictionary(RECEIPT_DICTIONARY).expect("Failed to initialize decompressor."))
);
}
/// Reusable decompressor that uses its own internal buffer.
#[allow(missing_debug_implementations)]
pub struct ReusableDecompressor {
/// zstd decompressor
decompressor: Decompressor<'static>,
/// buffer to decompress to.
buf: Vec<u8>,
}
impl ReusableDecompressor {
fn new(decompressor: Decompressor<'static>) -> Self {
Self { decompressor, buf: Vec::with_capacity(4096) }
}
/// Decompresses `src` reusing the decompressor and its internal buffer.
pub fn decompress(&mut self, src: &[u8]) -> &[u8] {
// `decompress_to_buffer` will return an error if the output buffer doesn't have
// enough capacity. However we don't actually have information on the required
// length. So we hope for the best, and keep trying again with a fairly bigger size
// if it fails.
while let Err(err) = self.decompressor.decompress_to_buffer(src, &mut self.buf) {
let err = err.to_string();
if !err.contains("Destination buffer is too small") {
panic!("Failed to decompress: {}", err);
}
self.buf.reserve(self.buf.capacity() + 24_000);
}
&self.buf
}
}

18
crates/primitives/src/transaction/mod.rs
View File

@ -897,25 +897,13 @@ impl Compact for TransactionSignedNoHash {
let zstd_bit = bitflags >> 3;
let (transaction, buf) = if zstd_bit != 0 {
TRANSACTION_DECOMPRESSOR.with(|decompressor| {
let mut decompressor = decompressor.borrow_mut();
let mut tmp: Vec<u8> = Vec::with_capacity(200);
// `decompress_to_buffer` will return an error if the output buffer doesn't have
// enough capacity. However we don't actually have information on the required
// length. So we hope for the best, and keep trying again with a fairly bigger size
// if it fails.
while let Err(err) = decompressor.decompress_to_buffer(buf, &mut tmp) {
let err = err.to_string();
if !err.contains("Destination buffer is too small") {
panic!("Failed to decompress: {}", err);
}
tmp.reserve(tmp.capacity() + 24_000);
}
let decompressor = &mut decompressor.borrow_mut();
// TODO: enforce that zstd is only present at a "top" level type
let transaction_type = (bitflags & 0b110) >> 1;
let (transaction, _) = Transaction::from_compact(tmp.as_slice(), transaction_type);
let (transaction, _) =
Transaction::from_compact(decompressor.decompress(buf), transaction_type);
(transaction, buf)
})

15
crates/storage/codecs/derive/src/compact/generator.rs
View File

@ -115,20 +115,11 @@ fn generate_from_compact(fields: &FieldList, ident: &Ident, is_zstd: bool) -> To
quote! {
if flags.__zstd() != 0 {
#decompressor.with(|decompressor| {
let mut decompressor = decompressor.borrow_mut();
let mut tmp: Vec<u8> = Vec::with_capacity(300);
while let Err(err) = decompressor.decompress_to_buffer(&buf[..], &mut tmp) {
let err = err.to_string();
if !err.contains("Destination buffer is too small") {
panic!("Failed to decompress: {}", err);
}
tmp.reserve(tmp.capacity() + 10_000);
}
let decompressor = &mut decompressor.borrow_mut();
let decompressed = decompressor.decompress(buf);
let mut original_buf = buf;
let mut buf: &[u8] = tmp.as_slice();
let mut buf: &[u8] = decompressed;
#(#lines)*
(obj, original_buf)
})