Merge b53951c into b502dee

rebar.config

@@ -10,8 +10,8 @@
     {erlzmq, {git, "https://github.com/zeromq/erlzmq2", {ref, "573d583"}}},
 
     %% antidote utilities
-    antidote_crdt,
-    antidote_pb_codec,
+    {antidote_crdt, {git, "https://github.com/SmallEndian/antidote_crdt", {branch, master}}},
+    {antidote_pb_codec, {git, "https://github.com/SmallEndian/antidote_pb_codec", {branch, master}}},
     antidotec_pb,
     vectorclock,
 

src/bcounter_mgr.erl

@@ -86,6 +86,10 @@ generate_downstream(Key, {decrement, {V, _}}, BCounter) ->
 generate_downstream(_Key, {increment, {Amount, _}}, BCounter) ->
     MyDCId = dc_meta_data_utilities:get_my_dc_id(),
     ?DATA_TYPE:downstream({increment, {Amount, MyDCId}}, BCounter);
+generate_downstream(Key, {increment, Amount}, BCounter) when Amount < 0->
+     generate_downstream(Key, {decrement, {-Amount, empty}}, BCounter);
+generate_downstream(Key, {increment, Amount}, BCounter)->
+     generate_downstream(Key, {increment, {Amount, empty}}, BCounter);
 
 %% @doc Processes a trasfer operation between two owners of the
 %% counter.

src/clocksi_interactive_coord.erl

@@ -764,7 +764,7 @@ execute_command(update_objects, UpdateOps, Sender, State = #state{transaction=Tr
                     updated_partitions=UpdatedPartitions
                 }
         end
-                     end,
+    end,
 
     NewCoordState = lists:foldl(
         ExecuteUpdates,

test/singledc/bcountermgr_SUITE.erl

@@ -87,9 +87,9 @@ new_bcounter_test(Config) ->
     Key = bcounter1_mgr,
 
     % FIXME why is this not working?
-    %{Value, _}  = antidote_utils:read_b_counter(Node, Key, Bucket),
-    %?assertEqual(0, Value).
-    check_read(Node, Key, 0, Bucket).
+    {Value, _}  = antidote_utils:read_b_counter(Node, Key, Bucket),
+    ?assertEqual(0, Value).
+    %check_read(Node, Key, 0, Bucket).
 
 read_si(Node, Key, CommitTime, Bucket) ->
     ct:log("Read si ~p", [Key]),

test/utils/antidote_utils.erl

@@ -78,7 +78,8 @@ read_b_counter(Node, Key, Bucket) ->
 read_b_counter_commit(Node, Key, Bucket, CommitTime) ->
     Obj = {Key, ?TYPE_B, Bucket},
     {ok, [Value], CommitTime} = rpc:call(Node, antidote, read_objects, [CommitTime, [], [Obj]]),
-    {?TYPE_B:permissions(Value), CommitTime}.
+	{?TYPE_B:value(Value), CommitTime}.
+    %{?TYPE_B:permissions(Value), CommitTime}.