Skip to content
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

The attempt to optimise merge was incorrect #79

Merged
merged 1 commit into from Feb 19, 2014

Conversation

@russelldb
Copy link
Member

@russelldb russelldb commented Feb 18, 2014

If LHS vclock dominates RHS vclock, there can still be removes
that need to be observed, so that optimisation was bogus.

If LHS vclock dominates RHS vclock, there can still be removes
that need to be observed, so that optimisation was bogus.
@russelldb
Copy link
Member Author

@russelldb russelldb commented Feb 18, 2014

Hat tip to https://github.com/asonge for the find, and the test.

-spec either_dominates(riak_dt_vclock:vclock(), riak_dt_vclock:vclock()) ->
riak_dt_vclock:vclock() | concurrent.
either_dominates(LHSClock, RHSClock) ->
case {riak_dt_vclock:descends(LHSClock, RHSClock),

This comment has been minimized.

@lenary

lenary Feb 19, 2014
Contributor

Is the optimisation worth keeping if you just change these lines to strict_descends? Frankly, this is what I always thought dominates meant...

This comment has been minimized.

@lenary

lenary Feb 19, 2014
Contributor

Oh, because there is no strict_descends... d'oh.

This comment has been minimized.

@russelldb

russelldb Feb 19, 2014
Author Member

No, there is a dominates in riak_dt_vclock, but even that is not right. Even if LHS dominates RHS, you still need to compare the contents against RHS's clock.

@russelldb
Copy link
Member Author

@russelldb russelldb commented Feb 19, 2014

Gonna YOLO merge as develop is broken, and this is essentially a rollback.

russelldb added a commit that referenced this pull request Feb 19, 2014
The attempt to optimise merge was incorrect
@russelldb russelldb merged commit 54927b6 into develop Feb 19, 2014
1 check passed
1 check passed
@kuenishi
default The Travis CI build passed
Details
@cmeiklejohn cmeiklejohn deleted the rdb/bug/gh78_optimise_broke_merge branch Feb 19, 2014
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants