-
Notifications
You must be signed in to change notification settings - Fork 20
feat(ffi-iterator): Implementation of Iterator in Rust (1/4) #1255
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.
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
base: amin/ffi-revision
Are you sure you want to change the base?
Conversation
…leblanc/fix-verify-exclusion-proof
…eblanc/ffi-refactor
…sion-proof' into brandon.leblanc/ffi-refactor
/// The iterator is exhausted | ||
None, | ||
/// The next item on iterator is returned. | ||
Some(OwnedKeyValuePair), |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is still a little confusing. The documentation is for this variant, but shouldn't the caller generally call fwd_free_owned_bytes
regardless of which variant of KeyValueResult is returned, or must they check that it is this variant and only call that method if so?
idk your level of git foo, but here's how I normally resolve the gnarly merge conflicts from the squash and merge:
So, to resolve your conflicts with main now that my PR is merged, do: # let git fetch the expired branch PR refs
git config --add remote.origin.fetch '+refs/pull/*/head:refs/remotes/origin/pr/*'
# fetch everything again
git fetch origin
git merge fcc07b8ba5e0716e3d8892a275010e77daaebbe5
git merge -s ours 8df1ccc1464f58839c732b57c6cd703e88137abc
git merge origin/main The git config change will bloat your local repo. You can keep it if you want, but I do recommend removing it after, fetching again, and then running |
/// The iterator is exhausted | ||
None, | ||
/// The next item on iterator is returned. | ||
Some(OwnedKeyValuePair), |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This doc looks correct to me, but the comment is not resolved. Is there more to do here? If not, please mark this resolved.
This PR is a step towards implementing the FFI iterator mentioned in #1009.
This implement FFI functions (
fwd_iter_on_root
,fwd_iter_on_proposal
,fwd_iter_next
) in Rust, and also necessary changes infirewood
crate forMerkleKeyValueStream
to work withArc<NodeStore<..>>
as well.