mirror of
https://github.com/pezkuwichain/pezkuwi-subxt.git
synced 2026-06-21 22:41:02 +00:00
73d9ae3284
* trie state cache
* Also cache missing access on read.
* fix comp
* bis
* fix
* use has_lru
* remove local storage cache on size 0.
* No cache.
* local cache only
* trie cache and local cache
* storage cache (with local)
* trie cache no local cache
* Add state access benchmark
* Remove warnings etc
* Add trie cache benchmark
* No extra "clone" required
* Change benchmark to use multiple blocks
* Use patches
* Integrate shitty implementation
* More stuff
* Revert "Merge branch 'master' into trie_state_cache"
This reverts commit 947cd8e6d43fced10e21b76d5b92ffa57b57c318, reversing
changes made to 29ff036463.
* Improve benchmark
* Adapt to latest changes
* Adapt to changes in trie
* Add a test that uses iterator
* Start fixing it
* Remove obsolete file
* Make it compile
* Start rewriting the trie node cache
* More work on the cache
* More docs and code etc
* Make data cache an optional
* Tests
* Remove debug stuff
* Recorder
* Some docs and a simple test for the recorder
* Compile fixes
* Make it compile
* More fixes
* More fixes
* Fix fix fix
* Make sure cache and recorder work together for basic stuff
* Test that data caching and recording works
* Test `TrieDBMut` with caching
* Try something
* Fixes, fixes, fixes
* Forward the recorder
* Make it compile
* Use recorder in more places
* Switch to new `with_optional_recorder` fn
* Refactor and cleanups
* Move `ProvingBackend` tests
* Simplify
* Move over all functionality to the essence
* Fix compilation
* Implement estimate encoded size for StorageProof
* Start using the `cache` everywhere
* Use the cache everywhere
* Fix compilation
* Fix tests
* Adds `TrieBackendBuilder` and enhances the tests
* Ensure that recorder drain checks that values are found as expected
* Switch over to `TrieBackendBuilder`
* Start fixing the problem with child tries and recording
* Fix recording of child tries
* Make it compile
* Overwrite `storage_hash` in `TrieBackend`
* Add `storage_cache` to the benchmarks
* Fix `no_std` build
* Speed up cache lookup
* Extend the state access benchmark to also hash a runtime
* Fix build
* Fix compilation
* Rewrite value cache
* Add lru cache
* Ensure that the cache lru works
* Value cache should not be optional
* Add support for keeping the shared node cache in its bounds
* Make the cache configurable
* Check that the cache respects the bounds
* Adds a new test
* Fixes
* Docs and some renamings
* More docs
* Start using the new recorder
* Fix more code
* Take `self` argument
* Remove warnings
* Fix benchmark
* Fix accounting
* Rip off the state cache
* Start fixing fallout after removing the state cache
* Make it compile after trie changes
* Fix test
* Add some logging
* Some docs
* Some fixups and clean ups
* Fix benchmark
* Remove unneeded file
* Use git for patching
* Make CI happy
* Update primitives/trie/Cargo.toml
Co-authored-by: Koute <koute@users.noreply.github.com>
* Update primitives/state-machine/src/trie_backend.rs
Co-authored-by: cheme <emericchevalier.pro@gmail.com>
* Introduce new `AsTrieBackend` trait
* Make the LocalTrieCache not clonable
* Make it work in no_std and add docs
* Remove duplicate dependency
* Switch to ahash for better performance
* Speedup value cache merge
* Output errors on underflow
* Ensure the internal LRU map doesn't grow too much
* Use const fn to calculate the value cache element size
* Remove cache configuration
* Fix
* Clear the cache in between for more testing
* Try to come up with a failing test case
* Make the test fail
* Fix the child trie recording
* Make everything compile after the changes to trie
* Adapt to latest trie-db changes
* Fix on stable
* Update primitives/trie/src/cache.rs
Co-authored-by: cheme <emericchevalier.pro@gmail.com>
* Fix wrong merge
* Docs
* Fix warnings
* Cargo.lock
* Bump pin-project
* Fix warnings
* Switch to released crate version
* More fixes
* Make clippy and rustdocs happy
* More clippy
* Print error when using deprecated `--state-cache-size`
* 🤦
* Fixes
* Fix storage_hash linkings
* Update client/rpc/src/dev/mod.rs
Co-authored-by: Arkadiy Paronyan <arkady.paronyan@gmail.com>
* Review feedback
* encode bound
* Rework the shared value cache
Instead of using a `u64` to represent the key we now use an `Arc<[u8]>`. This arc is also stored in
some extra `HashSet`. We store the key are in an extra `HashSet` to de-duplicate the keys accross
different storage roots. When the latest key usage is dropped in the lru, we also remove the key
from the `HashSet`.
* Improve of the cache by merging the old and new solution
* FMT
* Please stop coming back all the time :crying:
* Update primitives/trie/src/cache/shared_cache.rs
Co-authored-by: Arkadiy Paronyan <arkady.paronyan@gmail.com>
* Fixes
* Make clippy happy
* Ensure we don't deadlock
* Only use one lock to simplify the code
* Do not depend on `Hasher`
* Fix tests
* FMT
* Clippy 🤦
Co-authored-by: cheme <emericchevalier.pro@gmail.com>
Co-authored-by: Koute <koute@users.noreply.github.com>
Co-authored-by: Arkadiy Paronyan <arkady.paronyan@gmail.com>
328 lines
9.8 KiB
Rust
328 lines
9.8 KiB
Rust
// This file is part of Substrate.
|
|
|
|
// Copyright (C) 2015-2022 Parity Technologies (UK) Ltd.
|
|
// SPDX-License-Identifier: Apache-2.0
|
|
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
//! `NodeCodec` implementation for Substrate's trie format.
|
|
|
|
use super::node_header::{NodeHeader, NodeKind};
|
|
use crate::{error::Error, trie_constants};
|
|
use codec::{Compact, Decode, Encode, Input};
|
|
use hash_db::Hasher;
|
|
use sp_std::{borrow::Borrow, marker::PhantomData, ops::Range, vec::Vec};
|
|
use trie_db::{
|
|
nibble_ops,
|
|
node::{NibbleSlicePlan, NodeHandlePlan, NodePlan, Value, ValuePlan},
|
|
ChildReference, NodeCodec as NodeCodecT,
|
|
};
|
|
|
|
/// Helper struct for trie node decoder. This implements `codec::Input` on a byte slice, while
|
|
/// tracking the absolute position. This is similar to `std::io::Cursor` but does not implement
|
|
/// `Read` and `io` is not in `sp-std`.
|
|
struct ByteSliceInput<'a> {
|
|
data: &'a [u8],
|
|
offset: usize,
|
|
}
|
|
|
|
impl<'a> ByteSliceInput<'a> {
|
|
fn new(data: &'a [u8]) -> Self {
|
|
ByteSliceInput { data, offset: 0 }
|
|
}
|
|
|
|
fn take(&mut self, count: usize) -> Result<Range<usize>, codec::Error> {
|
|
if self.offset + count > self.data.len() {
|
|
return Err("out of data".into())
|
|
}
|
|
|
|
let range = self.offset..(self.offset + count);
|
|
self.offset += count;
|
|
Ok(range)
|
|
}
|
|
}
|
|
|
|
impl<'a> Input for ByteSliceInput<'a> {
|
|
fn remaining_len(&mut self) -> Result<Option<usize>, codec::Error> {
|
|
Ok(Some(self.data.len().saturating_sub(self.offset)))
|
|
}
|
|
|
|
fn read(&mut self, into: &mut [u8]) -> Result<(), codec::Error> {
|
|
let range = self.take(into.len())?;
|
|
into.copy_from_slice(&self.data[range]);
|
|
Ok(())
|
|
}
|
|
|
|
fn read_byte(&mut self) -> Result<u8, codec::Error> {
|
|
if self.offset + 1 > self.data.len() {
|
|
return Err("out of data".into())
|
|
}
|
|
|
|
let byte = self.data[self.offset];
|
|
self.offset += 1;
|
|
Ok(byte)
|
|
}
|
|
}
|
|
|
|
/// Concrete implementation of a [`NodeCodecT`] with SCALE encoding.
|
|
///
|
|
/// It is generic over `H` the [`Hasher`].
|
|
#[derive(Default, Clone)]
|
|
pub struct NodeCodec<H>(PhantomData<H>);
|
|
|
|
impl<H> NodeCodecT for NodeCodec<H>
|
|
where
|
|
H: Hasher,
|
|
{
|
|
const ESCAPE_HEADER: Option<u8> = Some(trie_constants::ESCAPE_COMPACT_HEADER);
|
|
type Error = Error<H::Out>;
|
|
type HashOut = H::Out;
|
|
|
|
fn hashed_null_node() -> <H as Hasher>::Out {
|
|
H::hash(<Self as NodeCodecT>::empty_node())
|
|
}
|
|
|
|
fn decode_plan(data: &[u8]) -> Result<NodePlan, Self::Error> {
|
|
let mut input = ByteSliceInput::new(data);
|
|
|
|
let header = NodeHeader::decode(&mut input)?;
|
|
let contains_hash = header.contains_hash_of_value();
|
|
|
|
let branch_has_value = if let NodeHeader::Branch(has_value, _) = &header {
|
|
*has_value
|
|
} else {
|
|
// hashed_value_branch
|
|
true
|
|
};
|
|
|
|
match header {
|
|
NodeHeader::Null => Ok(NodePlan::Empty),
|
|
NodeHeader::HashedValueBranch(nibble_count) | NodeHeader::Branch(_, nibble_count) => {
|
|
let padding = nibble_count % nibble_ops::NIBBLE_PER_BYTE != 0;
|
|
// check that the padding is valid (if any)
|
|
if padding && nibble_ops::pad_left(data[input.offset]) != 0 {
|
|
return Err(Error::BadFormat)
|
|
}
|
|
let partial = input.take(
|
|
(nibble_count + (nibble_ops::NIBBLE_PER_BYTE - 1)) /
|
|
nibble_ops::NIBBLE_PER_BYTE,
|
|
)?;
|
|
let partial_padding = nibble_ops::number_padding(nibble_count);
|
|
let bitmap_range = input.take(BITMAP_LENGTH)?;
|
|
let bitmap = Bitmap::decode(&data[bitmap_range])?;
|
|
let value = if branch_has_value {
|
|
Some(if contains_hash {
|
|
ValuePlan::Node(input.take(H::LENGTH)?)
|
|
} else {
|
|
let count = <Compact<u32>>::decode(&mut input)?.0 as usize;
|
|
ValuePlan::Inline(input.take(count)?)
|
|
})
|
|
} else {
|
|
None
|
|
};
|
|
let mut children = [
|
|
None, None, None, None, None, None, None, None, None, None, None, None, None,
|
|
None, None, None,
|
|
];
|
|
for i in 0..nibble_ops::NIBBLE_LENGTH {
|
|
if bitmap.value_at(i) {
|
|
let count = <Compact<u32>>::decode(&mut input)?.0 as usize;
|
|
let range = input.take(count)?;
|
|
children[i] = Some(if count == H::LENGTH {
|
|
NodeHandlePlan::Hash(range)
|
|
} else {
|
|
NodeHandlePlan::Inline(range)
|
|
});
|
|
}
|
|
}
|
|
Ok(NodePlan::NibbledBranch {
|
|
partial: NibbleSlicePlan::new(partial, partial_padding),
|
|
value,
|
|
children,
|
|
})
|
|
},
|
|
NodeHeader::HashedValueLeaf(nibble_count) | NodeHeader::Leaf(nibble_count) => {
|
|
let padding = nibble_count % nibble_ops::NIBBLE_PER_BYTE != 0;
|
|
// check that the padding is valid (if any)
|
|
if padding && nibble_ops::pad_left(data[input.offset]) != 0 {
|
|
return Err(Error::BadFormat)
|
|
}
|
|
let partial = input.take(
|
|
(nibble_count + (nibble_ops::NIBBLE_PER_BYTE - 1)) /
|
|
nibble_ops::NIBBLE_PER_BYTE,
|
|
)?;
|
|
let partial_padding = nibble_ops::number_padding(nibble_count);
|
|
let value = if contains_hash {
|
|
ValuePlan::Node(input.take(H::LENGTH)?)
|
|
} else {
|
|
let count = <Compact<u32>>::decode(&mut input)?.0 as usize;
|
|
ValuePlan::Inline(input.take(count)?)
|
|
};
|
|
|
|
Ok(NodePlan::Leaf {
|
|
partial: NibbleSlicePlan::new(partial, partial_padding),
|
|
value,
|
|
})
|
|
},
|
|
}
|
|
}
|
|
|
|
fn is_empty_node(data: &[u8]) -> bool {
|
|
data == <Self as NodeCodecT>::empty_node()
|
|
}
|
|
|
|
fn empty_node() -> &'static [u8] {
|
|
&[trie_constants::EMPTY_TRIE]
|
|
}
|
|
|
|
fn leaf_node(partial: impl Iterator<Item = u8>, number_nibble: usize, value: Value) -> Vec<u8> {
|
|
let contains_hash = matches!(&value, Value::Node(..));
|
|
let mut output = if contains_hash {
|
|
partial_from_iterator_encode(partial, number_nibble, NodeKind::HashedValueLeaf)
|
|
} else {
|
|
partial_from_iterator_encode(partial, number_nibble, NodeKind::Leaf)
|
|
};
|
|
match value {
|
|
Value::Inline(value) => {
|
|
Compact(value.len() as u32).encode_to(&mut output);
|
|
output.extend_from_slice(value);
|
|
},
|
|
Value::Node(hash) => {
|
|
debug_assert!(hash.len() == H::LENGTH);
|
|
output.extend_from_slice(hash);
|
|
},
|
|
}
|
|
output
|
|
}
|
|
|
|
fn extension_node(
|
|
_partial: impl Iterator<Item = u8>,
|
|
_nbnibble: usize,
|
|
_child: ChildReference<<H as Hasher>::Out>,
|
|
) -> Vec<u8> {
|
|
unreachable!("No extension codec.")
|
|
}
|
|
|
|
fn branch_node(
|
|
_children: impl Iterator<Item = impl Borrow<Option<ChildReference<<H as Hasher>::Out>>>>,
|
|
_maybe_value: Option<Value>,
|
|
) -> Vec<u8> {
|
|
unreachable!("No extension codec.")
|
|
}
|
|
|
|
fn branch_node_nibbled(
|
|
partial: impl Iterator<Item = u8>,
|
|
number_nibble: usize,
|
|
children: impl Iterator<Item = impl Borrow<Option<ChildReference<<H as Hasher>::Out>>>>,
|
|
value: Option<Value>,
|
|
) -> Vec<u8> {
|
|
let contains_hash = matches!(&value, Some(Value::Node(..)));
|
|
let mut output = match (&value, contains_hash) {
|
|
(&None, _) =>
|
|
partial_from_iterator_encode(partial, number_nibble, NodeKind::BranchNoValue),
|
|
(_, false) =>
|
|
partial_from_iterator_encode(partial, number_nibble, NodeKind::BranchWithValue),
|
|
(_, true) =>
|
|
partial_from_iterator_encode(partial, number_nibble, NodeKind::HashedValueBranch),
|
|
};
|
|
|
|
let bitmap_index = output.len();
|
|
let mut bitmap: [u8; BITMAP_LENGTH] = [0; BITMAP_LENGTH];
|
|
(0..BITMAP_LENGTH).for_each(|_| output.push(0));
|
|
match value {
|
|
Some(Value::Inline(value)) => {
|
|
Compact(value.len() as u32).encode_to(&mut output);
|
|
output.extend_from_slice(value);
|
|
},
|
|
Some(Value::Node(hash)) => {
|
|
debug_assert!(hash.len() == H::LENGTH);
|
|
output.extend_from_slice(hash);
|
|
},
|
|
None => (),
|
|
}
|
|
Bitmap::encode(
|
|
children.map(|maybe_child| match maybe_child.borrow() {
|
|
Some(ChildReference::Hash(h)) => {
|
|
h.as_ref().encode_to(&mut output);
|
|
true
|
|
},
|
|
&Some(ChildReference::Inline(inline_data, len)) => {
|
|
inline_data.as_ref()[..len].encode_to(&mut output);
|
|
true
|
|
},
|
|
None => false,
|
|
}),
|
|
bitmap.as_mut(),
|
|
);
|
|
output[bitmap_index..bitmap_index + BITMAP_LENGTH]
|
|
.copy_from_slice(&bitmap[..BITMAP_LENGTH]);
|
|
output
|
|
}
|
|
}
|
|
|
|
// utils
|
|
|
|
/// Encode and allocate node type header (type and size), and partial value.
|
|
/// It uses an iterator over encoded partial bytes as input.
|
|
fn partial_from_iterator_encode<I: Iterator<Item = u8>>(
|
|
partial: I,
|
|
nibble_count: usize,
|
|
node_kind: NodeKind,
|
|
) -> Vec<u8> {
|
|
let nibble_count = sp_std::cmp::min(trie_constants::NIBBLE_SIZE_BOUND, nibble_count);
|
|
|
|
let mut output = Vec::with_capacity(4 + (nibble_count / nibble_ops::NIBBLE_PER_BYTE));
|
|
match node_kind {
|
|
NodeKind::Leaf => NodeHeader::Leaf(nibble_count).encode_to(&mut output),
|
|
NodeKind::BranchWithValue => NodeHeader::Branch(true, nibble_count).encode_to(&mut output),
|
|
NodeKind::BranchNoValue => NodeHeader::Branch(false, nibble_count).encode_to(&mut output),
|
|
NodeKind::HashedValueLeaf =>
|
|
NodeHeader::HashedValueLeaf(nibble_count).encode_to(&mut output),
|
|
NodeKind::HashedValueBranch =>
|
|
NodeHeader::HashedValueBranch(nibble_count).encode_to(&mut output),
|
|
};
|
|
output.extend(partial);
|
|
output
|
|
}
|
|
|
|
const BITMAP_LENGTH: usize = 2;
|
|
|
|
/// Radix 16 trie, bitmap encoding implementation,
|
|
/// it contains children mapping information for a branch
|
|
/// (children presence only), it encodes into
|
|
/// a compact bitmap encoding representation.
|
|
pub(crate) struct Bitmap(u16);
|
|
|
|
impl Bitmap {
|
|
pub fn decode(mut data: &[u8]) -> Result<Self, codec::Error> {
|
|
Ok(Bitmap(u16::decode(&mut data)?))
|
|
}
|
|
|
|
pub fn value_at(&self, i: usize) -> bool {
|
|
self.0 & (1u16 << i) != 0
|
|
}
|
|
|
|
pub fn encode<I: Iterator<Item = bool>>(has_children: I, dest: &mut [u8]) {
|
|
let mut bitmap: u16 = 0;
|
|
let mut cursor: u16 = 1;
|
|
for v in has_children {
|
|
if v {
|
|
bitmap |= cursor
|
|
}
|
|
cursor <<= 1;
|
|
}
|
|
dest[0] = (bitmap % 256) as u8;
|
|
dest[1] = (bitmap / 256) as u8;
|
|
}
|
|
}
|