Merge branch 'rdb-counters'

Conflicts:
	src/basho_bench_driver_2i.erl

Author: russelldb

examples/counters.config

@@ -0,0 +1,34 @@
+{mode, max}.
+
+{duration, 5}.
+
+{concurrent, 1}.
+
+{driver, basho_bench_driver_riakc_pb}.
+
+{key_generator, {int_to_bin, {uniform_int, 10000}}}.
+
+{value_generator, {uniform_int, 50}}.
+
+{riakc_pb_ips, [{127,0,0,1}]}.
+
+{riakc_pb_replies, 2}.
+
+{operations, [{counter_incr, 100}, {counter_val, 1}]}.
+
+%% Use {auto_reconnect, false} to get "old" behavior (prior to April 2013).
+%% See deps/riakc/src/riakc_pb_socket.erl for all valid socket options.
+{pb_connect_options, [{auto_reconnect, true}]}.
+
+%% Overrides for the PB client's default 60 second timeout, on a
+%% per-type-of-operation basis.  All timeout units are specified in
+%% milliseconds.  The pb_timeout_general config item provides a
+%% default timeout if the read/write/listkeys/mapreduce timeout is not
+%% specified.
+
+{pb_timeout_general, 30000}.
+{pb_timeout_read, 5000}.
+{pb_timeout_write, 5000}.
+{pb_timeout_listkeys, 50000}.
+%% The general timeout will be used because this specific item is commented:
+%% {pb_timeout_mapreduce, 50000}.

src/basho_bench_driver_2i.erl

@@ -359,9 +359,6 @@ to_list(B) when is_binary(B) ->
 to_list(I) when is_integer(I) ->
     integer_to_list(I).
 
-choose(N, L) ->
-    lists:nth((N rem length(L) + 1), L).
-
 json_get(Url, State) ->
     Response = ibrowse:send_req(lists:flatten(Url), [], get,
                                 [], [], State#state.pb_timeout),

src/basho_bench_driver_riakc_pb.erl

@@ -31,8 +31,10 @@
 -record(state, { pid,
                  bucket,
                  r,
+                 pr,
                  w,
                  dw,
+                 pw,
                  rw,
                  keylist_length,
                  preloaded_keys,
@@ -75,6 +77,8 @@ new(Id) ->
     W = basho_bench_config:get(riakc_pb_w, Replies),
     DW = basho_bench_config:get(riakc_pb_dw, Replies),
     RW = basho_bench_config:get(riakc_pb_rw, Replies),
+    PW = basho_bench_config:get(riakc_pb_pw, Replies),
+    PR = basho_bench_config:get(riakc_pb_pr, Replies),
     Bucket  = basho_bench_config:get(riakc_pb_bucket, <<"test">>),
     KeylistLength = basho_bench_config:get(riakc_pb_keylist_length, 1000),
     PreloadedKeys = basho_bench_config:get(
@@ -90,9 +94,11 @@ new(Id) ->
             {ok, #state { pid = Pid,
                           bucket = Bucket,
                           r = R,
+                          pr = PR,
                           w = W,
                           dw = DW,
                           rw = RW,
+                          pw = PW,
                           keylist_length = KeylistLength,
                           preloaded_keys = PreloadedKeys,
                           timeout_general = get_timeout_general(),
@@ -234,8 +240,32 @@ run(mr_keylist_erlang, KeyGen, _ValueGen, State) ->
     mapred(State, Keylist, ?ERLANG_MR);
 run(mr_keylist_js, KeyGen, _ValueGen, State) ->
     Keylist = make_keylist(State#state.bucket, KeyGen,
-                          State#state.keylist_length),
-    mapred(State, Keylist, ?JS_MR).
+                           State#state.keylist_length),
+    mapred(State, Keylist, ?JS_MR);
+run(counter_incr, KeyGen, ValueGen, State) ->
+    Amt = ValueGen(),
+    Key = KeyGen(),
+    case riakc_pb_socket:counter_incr(State#state.pid, State#state.bucket, Key, Amt,
+                                      [{w, State#state.w},
+                                       {dw, State#state.dw},
+                                       {pw, State#state.pw}]) of
+        ok ->
+            {ok, State};
+        {error, Reason} ->
+            {error, Reason, State}
+    end;
+run(counter_val, KeyGen, _ValueGen, State) ->
+    Key = KeyGen(),
+    case riakc_pb_socket:counter_val(State#state.pid, State#state.bucket, Key,
+                                     [{r, State#state.r}, {pr, State#state.pr}]) of
+        {ok, _N} ->
+            {ok, State};
+        {error, notfound} ->
+            {ok, State};
+        {error, Reason} ->
+            {error, Reason, State}
+    end.
+
 
 %% ====================================================================
 %% Internal functions

src/basho_bench_valgen.erl

@@ -52,6 +52,10 @@ new({function, Module, Function, Args}, Id) ->
         _Error ->
             ?FAIL_MSG("Could not find valgen function: ~p:~p\n", [Module, Function])
     end;
+new({uniform_int, MaxVal}, _Id) ->
+    fun() -> random:uniform(MaxVal) end;
+new({uniform_int, MinVal, MaxVal}, _Id) ->
+    fun() -> random:uniform(MinVal, MaxVal) end;
 new(Other, _Id) ->
     ?FAIL_MSG("Unsupported value generator requested: ~p\n", [Other]).