Permalink
Browse files

Merge branch 'rdb-kv-counter' of beast:riak_kv into rdb-kv-counter

Conflicts:
	test/kv_counter_eqc.erl
  • Loading branch information...
2 parents d77e390 + 7c99ea1 commit 807df1472e78b6e4bca38eb15d62e7fa3debcda3 @russelldb russelldb committed Feb 12, 2013
Showing with 4 additions and 0 deletions.
  1. +4 −0 test/kv_counter_eqc.erl
View
@@ -101,6 +101,7 @@ prop_merge() ->
io:format("Merged ~p\n", [Merged]),
io:format("Index Specs ~p~n", [IndexSpecs])
end,
+
conjunction([
{value, equals(sumthem(RObj), riak_kv_counter:value(Merged))},
{verify_merge, verify_merge(RObj, Merged, IndexSpecs, FExpectedCounters, MergeSeed)}
@@ -196,6 +197,7 @@ counters_equal(undefined, _C2) ->
counters_equal(C1, C2) ->
riak_kv_pncounter:equal(C1, C2).
+
%% Extract a single {meta, counter} value
single_counter(Merged) ->
Contents = riak_object:get_contents(Merged),
@@ -220,6 +222,7 @@ non_counter_siblings(RObj) ->
Contents),
lists:sort(NonCounters).
+
num_counters(RObj) ->
Values = riak_object:get_values(RObj),
length([ok || Val <- Values,
@@ -298,3 +301,4 @@ index_value() ->
oneof([binary(), int()]).
-endif. % EQC
+

0 comments on commit 807df14

Please sign in to comment.