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

Handle Extension-nodes in Iterator #430

Merged
merged 10 commits into from
Dec 15, 2023
Merged

Handle Extension-nodes in Iterator #430

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
a204177
Make MerkleStream handle branches with values
richardpringle Dec 6, 2023
4efdd14
Stop prefetching next node in iterator
richardpringle Dec 11, 2023
4119d2c
Make MerkleKeyValueStream fused
richardpringle Dec 14, 2023
fb67626
Cleanup apis for stream
richardpringle Dec 14, 2023
cc3b0e2
Use boxed-slice as key
richardpringle Dec 14, 2023
980fed5
Rename parents to visited_node_path
richardpringle Dec 14, 2023
9a77439
Fix doc
richardpringle Dec 15, 2023
821a8b1
Remove dead code
richardpringle Dec 15, 2023
5800ccd
Remove TODO that was implemented
richardpringle Dec 15, 2023
9300305
Merge branch 'main' into move-merkle-stream
richardpringle Dec 15, 2023
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
14 changes: 8 additions & 6 deletions firewood/src/db.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,13 +318,15 @@ impl<S: ShaleStore<Node> + Send + Sync> api::DbView for DbRev<S> {
}

impl<S: ShaleStore<Node> + Send + Sync> DbRev<S> {
pub fn stream<K: KeyType>(
pub fn stream(&self) -> merkle::MerkleKeyValueStream<'_, S, Bincode> {
self.merkle.iter(self.header.kv_root)
}

pub fn stream_from(
&self,
start_key: Option<K>,
) -> Result<merkle::MerkleKeyValueStream<'_, S, Bincode>, api::Error> {
self.merkle
.get_iter(start_key, self.header.kv_root)
.map_err(|e| api::Error::InternalError(Box::new(e)))
start_key: Box<[u8]>,
) -> merkle::MerkleKeyValueStream<'_, S, Bincode> {
self.merkle.iter_from(self.header.kv_root, start_key)
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This is a significant improvement to the API. It was such a pain specifying the type on the None when it could be any number of things. It's too bad there's no default generic, like with structs and enums.

Copy link
Contributor

Choose a reason for hiding this comment

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

yeah, I like that.

}

fn flush_dirty(&mut self) -> Option<()> {
Expand Down
32 changes: 17 additions & 15 deletions firewood/src/merkle.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ pub use node::{
NodeType, PartialPath,
};
pub use proof::{Proof, ProofError};
use stream::IteratorState;
pub use stream::MerkleKeyValueStream;
pub use trie_hash::{TrieHash, TRIE_HASH_LEN};

Expand Down Expand Up @@ -1221,16 +1220,16 @@ impl<S: ShaleStore<Node> + Send + Sync, T> Merkle<S, T> {
self.store.flush_dirty()
}

pub(crate) fn get_iter<K: AsRef<[u8]>>(
pub(crate) fn iter(&self, root: DiskAddress) -> MerkleKeyValueStream<'_, S, T> {
MerkleKeyValueStream::new(self, root)
}

pub(crate) fn iter_from(
&self,
key: Option<K>,
root: DiskAddress,
) -> Result<MerkleKeyValueStream<'_, S, T>, MerkleError> {
Ok(MerkleKeyValueStream {
key_state: IteratorState::new(key),
merkle_root: root,
merkle: self,
})
key: Box<[u8]>,
) -> MerkleKeyValueStream<'_, S, T> {
MerkleKeyValueStream::from_key(self, root, key)
}

pub(super) async fn range_proof<K: api::KeyType + Send + Sync>(
Expand All @@ -1241,13 +1240,15 @@ impl<S: ShaleStore<Node> + Send + Sync, T> Merkle<S, T> {
limit: Option<usize>,
) -> Result<Option<api::RangeProof<Vec<u8>, Vec<u8>>>, api::Error> {
// limit of 0 is always an empty RangeProof
if let Some(0) = limit {
if limit == Some(0) {
return Ok(None);
}

let mut stream = self
.get_iter(first_key, root)
.map_err(|e| api::Error::InternalError(Box::new(e)))?;
let mut stream = match first_key {
// TODO: fix the call-site to force the caller to do the allocation
Some(key) => self.iter_from(root, key.as_ref().to_vec().into_boxed_slice()),
None => self.iter(root),
};

// fetch the first key from the stream
let first_result = stream.next().await;
Expand All @@ -1264,7 +1265,7 @@ impl<S: ShaleStore<Node> + Send + Sync, T> Merkle<S, T> {
.map_err(|e| api::Error::InternalError(Box::new(e)))?;
let limit = limit.map(|old_limit| old_limit - 1);

let mut middle = vec![(first_key, first_data)];
let mut middle = vec![(first_key.into_vec(), first_data)];
Copy link
Contributor Author

Choose a reason for hiding this comment

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

I wasn't sure about this, but we can change it later. into_vec does not allocate.


// we stop streaming if either we hit the limit or the key returned was larger
// than the largest key requested
Expand All @@ -1283,8 +1284,9 @@ impl<S: ShaleStore<Node> + Send + Sync, T> Merkle<S, T> {
};

// keep going if the key returned is less than the last key requested
ready(kv.0.as_slice() <= last_key.as_ref())
ready(&*kv.0 <= last_key.as_ref())
})
.map(|kv_result| kv_result.map(|(k, v)| (k.into_vec(), v)))
.try_collect::<Vec<(Vec<u8>, Vec<u8>)>>()
.await?,
);
Expand Down
Loading