Add delete_unique as an option

Author: martinsumner

examples/riakc_nhs_general.config

@@ -1,6 +1,6 @@
 {mode, max}.
 
-{duration, 1440}.
+{duration, 2880}.
 
 {report_interval, 10}.
 
@@ -18,18 +18,20 @@
 %% For alwaysget operations what is:
 %% - the maximum number of keys per worker (max number of keys = this * concurrent)
 %% - whether the inserts should be in key_order
-{alwaysget, {240000, 100000, skew_order}}.
+{alwaysget, {1000000, 300000, skew_order}}.
 {unique, {8000, skew_order}}.
 
 {pb_ips, [{127,0,0,1}]}.
 {http_ips, [{127,0,0,1}]}.
 
 {riakc_pb_replies, 1}.
 
-{operations, [{alwaysget_pb, 651}, {alwaysget_updatewith2i, 120}, 
-                {put_unique, 95}, {get_unique, 130},
+{operations, [{alwaysget_pb, 621}, {alwaysget_updatewith2i, 130}, 
+                {put_unique, 90}, {get_unique, 130}, {delete_unique, 25},
                 {postcodequery_http, 3}, {dobquery_http, 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}]}.

rebar.config

@@ -19,11 +19,11 @@
   {folsom, ".*", {git, "git://github.com/basho/folsom.git", {branch, "boundary-0.7.1+basho-bench-float"}}},
   {lager, "2.*", {git, "git://github.com/basho/lager", {tag, "2.1.0"}}},
   {ibrowse, ".*",
-   {git, "git://github.com/cmullaparthi/ibrowse.git", {tag, "v4.0.2"}}},
+   {git, "git://github.com/basho/ibrowse.git", {branch, "develop-2.9"}}},
   {riakc, ".*",
-   {git, "git://github.com/basho/riak-erlang-client", {branch, "master"}}},
-  {mochiweb, "2.9.*",
-   {git, "git://github.com/basho/mochiweb", {tag, "v2.9.0"}}},
+   {git, "git://github.com/basho/riak-erlang-client", {branch, "develop-2.9"}}},
+  {mochiweb, ".*",
+   {git, "git://github.com/basho/mochiweb", {branch, "develop-2.9"}}},
   {getopt, ".*",
    {git, "git://github.com/jcomellas/getopt", {tag, "v0.8.2"}}},
 

src/basho_bench_driver_nhs.erl

@@ -54,6 +54,7 @@
                 % ID 1 is nominated to do special work
                 singleton_pid :: pid() | undefined,
                 unique_key_count = 1 :: non_neg_integer(),
+                unique_key_lowcount = 1 :: non_neg_integer(),
                 alwaysget_key_count = 1 :: non_neg_integer(),
                 keyid :: binary(),
                 last_forceaae = os:timestamp() :: erlang:timestamp()
@@ -432,7 +433,8 @@ run(get_unique, _KeyGen, _ValueGen, State) ->
     Pid = State#state.pb_pid,
     Bucket = State#state.documentBucket,
     UKC = State#state.unique_key_count,
-    Key = generate_uniquekey(random:uniform(UKC),
+    LKC = State#state.unique_key_lowcount,
+    Key = generate_uniquekey(LKC + random:uniform(UKC - LKC),
                                 State#state.keyid,
                                 State#state.unique_keyorder),
     case riakc_pb_socket:get(Pid, Bucket, Key, State#state.pb_timeout) of
@@ -443,6 +445,28 @@ run(get_unique, _KeyGen, _ValueGen, State) ->
         {error, Reason} ->
             {error, Reason, State}
     end;
+run(delete_unique, _KeyGen, _ValueGen, State) ->
+    %% Delete one of the unique keys, assuming that the deletions have not
+    %% caught up with the PUTs
+    Pid = State#state.pb_pid,
+    B = State#state.documentBucket,
+    UKC = State#state.unique_key_count,
+    LKC = State#state.unique_key_lowcount,
+    case LKC < UKC of
+        true ->
+            Key = generate_uniquekey(LKC,
+                                        State#state.keyid,
+                                        State#state.unique_keyorder),
+            R = riakc_pb_socket:delete(Pid, B, Key, State#state.pb_timeout),
+            case R of
+                ok ->
+                    {ok, State#state{unique_key_lowcount = LKC + 1}};
+                {error, Reason} ->
+                    {error, Reason, State#state{unique_key_lowcount = LKC + 1}}
+            end;
+        false ->
+            {ok, State}
+    end;
 
 %% Query results via the HTTP interface.
 run(postcodequery_http, _KeyGen, _ValueGen, State) ->