Streaming iterator spike #342
Closed
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
There are several TODOs here, but the code works for the two test cases I created. Both of these avoid making extension nodes, which are going away, and this code may need some tweaks to support values inside branch nodes.
Per review comments
Per review comments
Per review comments
Per review comments
IteratorState is any of: - Start at the beginning of the trie - Start at a specific key value of the trie - Continue after a saved node and parents See the inline comments for more details. TODO: - Implement StartAtBegininng (and tests) - If a key is provided that doesn't exist, start iterating at the next one (if we really need this) - If an error is returned, we should next return None, then start from the beginning. This makes the resumption after an error a little cleaner. We'd need another IteratorState for this. - Remove extension nodes (depends on other diffs)
This was an artifact from an earlier change. Reverted back to original.
Seems like we can just reference self and it works!
Removed unnecessary clone Added additional comments Added TODO for a few things: - possible to return a reference to the value instead of a copy - should handle case of branch nodes with values while traversing Adding a randomized key-value test after extension nodes are removed is also recommended.
xinifinity
reviewed
Nov 14, 2023
| .map(|node| (node, u8::MAX)) | ||
| .map_err(|e| api::Error::InternalError(e.into()))?; | ||
|
|
||
| // TODO: If the branch has a value, then we shouldn't keep_going |
There was a problem hiding this comment.
Hmm, would it be better to fix this issue in this PR instead of leaving a TODO? It seems a straightforward fix.
| use node::tests::{extension, leaf}; | ||
| use shale::{cached::DynamicMem, compact::CompactSpace, CachedStore}; | ||
| use std::sync::Arc; | ||
| use test_case::test_case; | ||
| //use itertools::Itertools; |
There was a problem hiding this comment.
nit: Why not remove this line?
| key: Option<K>, | ||
| root: DiskAddress, | ||
| ) -> Result<MerkleKeyValueStream<'_, S>, MerkleError> { | ||
| // TODO: if DiskAddress::is_null() ... |
There was a problem hiding this comment.
Will all this TODOs be tracked in a issue so that we won't forget about it? All of them seem a must do.
There was a problem hiding this comment.
This was fixed in #346
|
Abandoning this in favor of #346, which contains all these commits |
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.
This is ready for feedback.
There are still some unfinished parts, all annotated with TODO. Notably: