Fix merge fn closure from pr385 #481
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
stanislav-tkach
approved these changes
Nov 24, 2020
aleksuss
reviewed
Dec 7, 2020
src/merge_operator.rs
Outdated
| @@ -61,16 +62,25 @@ use std::mem; | |||
| use std::ptr; | |||
| use std::slice; | |||
|
|
|||
| pub type MergeFn = fn(&[u8], Option<&[u8]>, &mut MergeOperands) -> Option<Vec<u8>>; | |||
| //pub type MergeFn = fn(&[u8], Option<&[u8]>, &mut MergeOperands) -> Option<Vec<u8>>; | |||
There was a problem hiding this comment.
Is this comment really needed ?
There was a problem hiding this comment.
Obviously not, it can be deleted
There was a problem hiding this comment.
As I suspect things may get stuck here. I think this was a suggestion for you to update the PR @BoOTheFurious . But from your comment it seems like you expect someone else to do it 😄
There was a problem hiding this comment.
Sorry… I've done it
added 2 commits
December 7, 2020 16:13
…BoOTheFurious/rust-rocksdb into fix-merge-fn-closure_from_pr385
aleksuss
reviewed
Dec 8, 2020
src/merge_operator.rs
Outdated
| @@ -41,7 +41,8 @@ | |||
| //!let mut opts = Options::default(); | |||
| //! | |||
| //!opts.create_if_missing(true); | |||
| //!opts.set_merge_operator("test operator", concat_merge, None); | |||
| //!opts.set_merge_operator_associative("test operator", concat_merge); | |||
| //!//opts.set_merge_operator("test operator", concat_merge, partial_concat_merge); // if your merge is not associative | |||
There was a problem hiding this comment.
I suppose this comment could be deleted as well ?
aleksuss
approved these changes
Dec 8, 2020
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.
Hello,
I 've got a use case which need to use stateful closure as merge function. As an old PR refers to my needs (PR#385 1 year old) I have rebase on current master. I have also integrated PR#480 to pass the test.
All works fine. I hope It will be accepted quickly.
Thanks @mrobakowski for the works on the initial PR.
Regards