Skip to content
This repository was archived by the owner on Nov 15, 2023. It is now read-only.

Implement change trie for child trie. #3122

Merged
svyatonik merged 18 commits into from
Sep 2, 2019
Merged

Implement change trie for child trie. #3122

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
2c06d30
Initial implementation, some redundancy is awkward and there is
cheme Jul 12, 2019
c93875d
Minimal tests and fix extend child.
cheme Jul 15, 2019
a5483cb
implement iterator for change child trie.
cheme Jul 15, 2019
b9b532f
prune child trie.
cheme Jul 15, 2019
4bd0fbc
Fix pruning test.
cheme Jul 15, 2019
c27dda2
Merge branch 'master' into ch-ch-trie
cheme Jul 15, 2019
ed8cc0d
bump spec version.
cheme Jul 15, 2019
ccc76a4
Merge branch 'master' into ch-ch-trie
cheme Jul 16, 2019
cd0abc6
Avoid empty child trie (could also be checked before)
cheme Jul 24, 2019
58eeee3
tabs.
cheme Jul 24, 2019
c00ca20
Fix child digest overriding each others.
cheme Jul 24, 2019
baccaed
Merge branch 'master' into ch-ch-trie
cheme Aug 8, 2019
c24f418
Merge branch 'master' into ch-ch-trie
cheme Aug 29, 2019
24d3b85
Merge branch 'master' into ch-ch-trie
cheme Aug 29, 2019
bebab64
Restore doc deleted on merge.
cheme Aug 29, 2019
90e1b8f
Check correct child value on extrinsics build.
cheme Aug 30, 2019
54383a9
Merge branch 'master' into ch-ch-trie
cheme Sep 2, 2019
92240c9
Revert runtime version update.
cheme Sep 2, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix child digest overriding each others.
  • Loading branch information
@cheme
cheme committed Jul 24, 2019
commit c00ca20285c070f9ce91e9ee1264a00c7084d22f
23 changes: 14 additions & 9 deletions core/state-machine/src/changes_trie/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,12 @@ fn prepare_digest_input<'a, S, H, Number>(


for (storage_key, trie_root) in children_roots.into_iter() {
let mut map = BTreeMap::<Vec<u8>, _>::new();
let child_index = ChildIndex::<Number> {
block: block.clone(),
storage_key,
};

let mut map = child_map.entry(child_index).or_insert_with(|| BTreeMap::<Vec<u8>, _>::new());
let trie_storage = TrieBackendEssence::<_, H>::new(
crate::changes_trie::TrieBackendStorageAdapter(storage),
trie_root,
Expand All @@ -277,21 +282,15 @@ fn prepare_digest_input<'a, S, H, Number>(
if let Some(InputKey::DigestIndex::<Number>(trie_key)) = Decode::decode(&mut &key[..]) {
insert_to_map(&mut map, trie_key.key);
});


let child_index = ChildIndex::<Number> {
block: block.clone(),
storage_key,
};
child_map.insert(child_index, map.into_iter().map(|(_, (k, v))| InputPair::DigestIndex(k, v)));
}
Ok((map, child_map))

})

.map(|(pairs, child_pairs)| (
pairs.into_iter().map(|(_, (k, v))| InputPair::DigestIndex(k, v)),
child_pairs,
child_pairs.into_iter().map(|(sk, pairs)|
(sk, pairs.into_iter().map(|(_, (k, v))| InputPair::DigestIndex(k, v)))).collect(),
))
}

Expand Down Expand Up @@ -478,7 +477,10 @@ mod test {
vec![
InputPair::ExtrinsicIndex(ExtrinsicIndex { block: 4u64, key: vec![100] }, vec![0, 2, 3]),

InputPair::DigestIndex(DigestIndex { block: 4, key: vec![100] }, vec![1]),
InputPair::DigestIndex(DigestIndex { block: 4, key: vec![101] }, vec![1]),
InputPair::DigestIndex(DigestIndex { block: 4, key: vec![102] }, vec![2]),
InputPair::DigestIndex(DigestIndex { block: 4, key: vec![105] }, vec![1]),
]),
(ChildIndex { block: 4, storage_key: b"2".to_vec() },
vec![
Expand Down Expand Up @@ -560,7 +562,10 @@ mod test {
vec![
InputPair::ExtrinsicIndex(ExtrinsicIndex { block: 4u64, key: vec![100] }, vec![0, 2, 3]),

InputPair::DigestIndex(DigestIndex { block: 4, key: vec![100] }, vec![1]),
InputPair::DigestIndex(DigestIndex { block: 4, key: vec![101] }, vec![1]),
InputPair::DigestIndex(DigestIndex { block: 4, key: vec![102] }, vec![2]),
InputPair::DigestIndex(DigestIndex { block: 4, key: vec![105] }, vec![1]),
]),
(ChildIndex { block: 4, storage_key: b"2".to_vec() },
vec![
Expand Down
5 changes: 3 additions & 2 deletions core/state-machine/src/overlayed_changes.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,12 +180,13 @@ impl OverlayedChanges {
});

if let Some(committed_map) = self.committed.children.get(storage_key) {
for (key, _) in committed_map.iter() {
for (key, value) in committed_map.iter() {
if !map_entry.contains_key(key) {
map_entry.insert(key.clone(), OverlayedValue {
Copy link
Contributor

@svyatonik svyatonik Jul 24, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If value has been changed in previous extrinsics, then this .insert() call will replace existing entry, thus forgetting previous extrinsics indices.

value: None,
extrinsics: extrinsic_index.map(|i| {
let mut e = BTreeSet::default();
let mut e = value.extrinsics.clone()
.unwrap_or_else(|| BTreeSet::default());
e.insert(i);
e
}),
Expand Down