Code

Dotted Version Vectors Sets#572

Code

Closed

ricardobcl wants to merge 26 commits intobasho:masterbasho/riak_kv:masterfrom ricardobcl:dvvsetricardobcl/riak_kv:dvvsetCopy head branch name to clipboard

+323-347

Commits

Commits on Apr 10, 2012

• First working commit, with dotted version vectors.

  ricardobcl

  committed
  850584d

  Copy full SHA for 850584d

Commits on Apr 12, 2012

• Corrected few errors and all unit tests now work.

  ricardobcl

  committed
  cf0be54

  Copy full SHA for cf0be54

Commits on May 21, 2012

• In reconcile/1, descends already tests if params are equal.

  ricardobcl

  committed
  5b7040b

  Copy full SHA for 5b7040b

Commits on May 23, 2012

• More efficient reconcile/1, doing pair-wise syncs

  ricardobcl

  committed
  19666c4

  Copy full SHA for 19666c4

Commits on Nov 24, 2012

• Merge with branch compactDVV

  ricardobcl

  committed
  554ead8

  Copy full SHA for 554ead8

• Correct version of riak_object.erl

  ricardobcl

  committed
  921f176

  Copy full SHA for 921f176

• Use my fork of riak_core with supoport to dotted version vectors

  ricardobcl

  committed
  2187ee1

  Copy full SHA for 2187ee1

Commits on Nov 27, 2012

• Script to run dstat

  ricardobcl

  committed
  fcc0578

  Copy full SHA for fcc0578

Commits on Nov 30, 2012

• Merged with basho master branch on 30/11/2012

  ricardobcl

  committed
  9487ff8

  Copy full SHA for 9487ff8

• Deleted dstat_script.sh file

  ricardobcl

  committed
  7c6f4d7

  Copy full SHA for 7c6f4d7

Commits on Dec 1, 2012

• Corrected duplicate riak_kv_index_req_v2 in riak_kv_vnode.hrl

  ricardobcl

  committed
  d82b865

  Copy full SHA for d82b865

Commits on Dec 12, 2012

• Delete extra files that were generated from mergetool

  ricardobcl

  committed
  94aaa7f

  Copy full SHA for 94aaa7f

Commits on Dec 14, 2012

• Deleted some commented files and updated some docs

  ricardobcl

  committed
  7574ed4

  Copy full SHA for 7574ed4

Commits on Jan 3, 2013

• Support for Compact Version of DVV.

  ricardobcl

  committed
  70dd894

  Copy full SHA for 70dd894

• Updated rebar to use the correct branch of riak_core.

  ricardobcl

  committed
  bfd1c04

  Copy full SHA for bfd1c04

Commits on Jan 4, 2013

• Corrected get_contents/1, obj_not_deleted/1 and simplified hash_object/1.

  ricardobcl

  committed
  ddcea0b

  Copy full SHA for ddcea0b

Commits on Jan 9, 2013

• Corrected a few bugs and unit tests now all pass.

  ricardobcl

  committed
  e1492fe

  Copy full SHA for e1492fe

Commits on Jan 12, 2013

• Corrected some bugs, namely set_vclock/2, reconcile/2, update_vclock/3 and increment_vclock/2.

  ricardobcl

  committed
  e8e9ece

  Copy full SHA for e8e9ece

Commits on Jan 14, 2013

• Use lww while comparing timestamps in metadata.

  ricardobcl

  committed
  f6d961d

  Copy full SHA for f6d961d

Commits on Jan 25, 2013

• Support for new causal clock: dvvset.

  ricardobcl

  committed
  dd3ac7f

  Copy full SHA for dd3ac7f

• Correct bug in riak_object:set_vclock and changed riak_object:new_vclock to give an empty version vector.

  ricardobcl

  committed
  9e96b6d

  Copy full SHA for 9e96b6d

Commits on Jan 28, 2013

• Corrected syntax error in riak_object:set_vclock/2

  ricardobcl

  committed
  33fefaf

  Copy full SHA for 33fefaf

Commits on Feb 15, 2013

• Updated calls to functions from dvvset.erl in riak_object.erl

  ricardobcl

  committed
  f784200

  Copy full SHA for f784200

Commits on Feb 20, 2013

• Corrected riak_object:equal_vclock.

  ricardobcl

  committed
  a337eaf

  Copy full SHA for a337eaf

Commits on Feb 28, 2013

• Minor reafactoring to riak_object.erl

  ricardobcl

  committed
  457558e

  Copy full SHA for 457558e

Commits on Jun 5, 2013

• removed some debug prints

  ricardobcl

  committed
  407d19c

  Copy full SHA for 407d19c