Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Optimize multi-level parents builder #79

Merged
merged 15 commits into from
Nov 28, 2022
Merged

Optimize multi-level parents builder #79

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
6c7aada
Flip loops order
michaelsutton Nov 16, 2022
0607829
Move empty level check to inner
michaelsutton Nov 16, 2022
f700e03
Use BlockHashMap/Set
michaelsutton Nov 16, 2022
5eb9df6
Filter inner duplicates with an hash set
michaelsutton Nov 16, 2022
79046f6
Apply clippy suggestion
michaelsutton Nov 16, 2022
c0c6a85
Avoid outer vector
michaelsutton Nov 16, 2022
1df5040
Use retain
michaelsutton Nov 16, 2022
4a5f96a
Make query of origin children future more readable
michaelsutton Nov 27, 2022
60ba30c
We need to iterate parent's parents only if parent is not at block_level
michaelsutton Nov 27, 2022
c721155
Fix comments
michaelsutton Nov 27, 2022
d71eda2
Use smallvec for ref blocks
michaelsutton Nov 27, 2022
dbbb179
Mark first parent's parents
michaelsutton Nov 28, 2022
b0af6d1
Use u8 for block_level loop variable
michaelsutton Nov 28, 2022
fbff4bf
And comment and turn some reachability queries into a lazy evaluation
michaelsutton Nov 28, 2022
4d58c09
Add a test for the case of multiple parallel high-level parents which…
michaelsutton Nov 28, 2022
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
11 changes: 11 additions & 0 deletions consensus/src/model/services/reachability.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ pub trait ReachabilityService {
fn is_dag_ancestor_of(&self, this: Hash, queried: Hash) -> bool;
fn is_dag_ancestor_of_any(&self, this: Hash, queried: &mut impl Iterator<Item = Hash>) -> bool;
fn is_any_dag_ancestor(&self, list: &mut impl Iterator<Item = Hash>, queried: Hash) -> bool;
fn is_any_dag_ancestor_result(&self, list: &mut impl Iterator<Item = Hash>, queried: Hash) -> Result<bool>;
fn get_next_chain_ancestor(&self, descendant: Hash, ancestor: Hash) -> Hash;
}

Expand Down Expand Up @@ -50,6 +51,16 @@ impl<T: ReachabilityStoreReader + ?Sized> ReachabilityService for MTReachability
list.any(|hash| inquirer::is_dag_ancestor_of(read_guard.deref(), hash, queried).unwrap())
}

fn is_any_dag_ancestor_result(&self, list: &mut impl Iterator<Item = Hash>, queried: Hash) -> Result<bool> {
let read_guard = self.store.read();
for hash in list {
if inquirer::is_dag_ancestor_of(read_guard.deref(), hash, queried)? {
return Ok(true);
}
}
Ok(false)
}

fn is_dag_ancestor_of_any(&self, this: Hash, queried: &mut impl Iterator<Item = Hash>) -> bool {
let read_guard = self.store.read();
queried.any(|hash| inquirer::is_dag_ancestor_of(read_guard.deref(), this, hash).unwrap())
Expand Down
Loading