Make dvv_enabled a bucket property
#891
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
First, remove unnecessary dict -> list -> dict conversion. This conversion was previously added to address a bug arising from equivalent dicts having different structure (and thus not comparing equal as terms). Rather than performing the conversion, this commit uses a custom comparison function to achieve the same effect. The new comparison approach exits early in the common case. Even in the uncommon case, the comparison function only does a dict -> list conversion, avoiding the final list -> dict from before. Second, change fold_contents/3 to not use an ordset for tracking kept siblings (which has O(N^2) complexity), but instead construct a simple list (with possible duplicates) that is then sorted/filtered at the end. In micro-benchmarking, this commit improved non-DVV merging by 10x, and DVV merging by 2x.
…-opt-merge Conflicts: src/riak_object.erl
Set it's default to `false` on legacy/default buckets Set it's default to `true` on typed buckets Update all the tests and associated places this change touches
|
Sorry @cmeiklejohn do not have the time/patience to put the optimisations and bucket prop stuff as separate things. Feel free to do it yourself, though. |
|
Do any of the tests specifically test the false case? The case where the bucket is mecked to return [] and [dvv_enabled] both end up executing the true case, since the default of the get_value is true. |
|
Other than that, I'm 👍 on this changeset. |
|
I didn't write new tests, no. I can write some on Monday, or you can add some if you like. |
|
Cool, just wanted to make sure you didn't think something was tested that wasn't. I'd say merge. |
|
Oh, it needs basho/riak_core#568 |
russelldb
added a commit
that referenced
this pull request
Apr 4, 2014
Make `dvv_enabled` a bucket property
| @@ -294,6 +295,41 @@ merge_contents(NewObject, OldObject, true) -> | |||
| riak_kv_crdt:log_merge_errors(Bucket, Key, CRDT, Error), | |||
| merge_acc_to_contents(MergeAcc). | |||
|
|
|||
| %% Optimisation. To save converting every meta dict to a list sorting, | |||
| %% comapring, and coverting back again, we use this optimisation, that | |||
There was a problem hiding this comment.
Late to the game, but well spotted. New branch and PR? Or live with it like "referer"?
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.
Set it's default to false on legacy/default buckets
Set it's default to true on typed buckets
Update all the tests and associated places this change touches