Handle Extension-nodes in Iterator #430
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Contributor
richardpringle
commented
Dec 11, 2023
richardpringle
commented
- Move MerkleStream to submodule
- Make MerkleStream handle branches with values
- Stop prefetching next node in iterator
richardpringle
force-pushed
the
move-merkle-stream
branch
from
61307e0 to
0431824
Compare
richardpringle
commented
Dec 11, 2023
rkuris
reviewed
Dec 12, 2023
rkuris
reviewed
Dec 12, 2023
rkuris
reviewed
Dec 12, 2023
rkuris
reviewed
Dec 13, 2023
richardpringle
force-pushed
the
move-merkle-stream
branch
from
487fe8d to
7dae9e3
Compare
richardpringle
force-pushed
the
move-merkle-stream
branch
from
6861cf3 to
980fed5
Compare
richardpringle
commented
Dec 15, 2023
| .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) |
There was a problem hiding this comment.
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.
richardpringle
commented
Dec 15, 2023
| @@ -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)]; | |||
There was a problem hiding this comment.
I wasn't sure about this, but we can change it later. into_vec does not allocate.
xinifinity
approved these changes
Dec 15, 2023
| .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) |
| } | ||
|
|
||
| #[tokio::test] | ||
| async fn start_at_key_greater_than_all_others() { |
There was a problem hiding this comment.
thanks a lot for the thorough test lists! On top of that may be start_at_key_smaller_than_all_others ? I guess this may be already covered, but just to make it explicitly covered.
| } | ||
|
|
||
| enum NodeRef<'a> { | ||
| New(ObjRef<'a>), |
| Ok(next) | ||
| } | ||
|
|
||
| fn find_next_node_with_data<'a, S: ShaleStore<Node>, T>( |
There was a problem hiding this comment.
nit: as the core function, I feel it deserves some high level comments describe how things work.
rkuris
approved these changes
Dec 15, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.