Merge pull request #241 from basho/bz1254-expose-link-walking-tombstones

BZ1254: Expose tombstones in siblings and link-walking queries over HTTP.

src/riak_kv_delete.erl

@@ -27,6 +27,7 @@
 -ifdef(TEST).
 -include_lib("eunit/include/eunit.hrl").
 -endif.
+-include("riak_kv_wm_raw.hrl").
 
 -export([start_link/6, start_link/7, start_link/8, delete/8]).
 
@@ -72,7 +73,7 @@ delete(ReqId,Bucket,Key,Options,Timeout,Client,ClientId,VClock) ->
         {error, Reason} ->
             Client ! {ReqId, {error, Reason}};
         {W, PW, DW} ->
-            Obj0 = riak_object:new(Bucket, Key, <<>>, dict:store(<<"X-Riak-Deleted">>,
+            Obj0 = riak_object:new(Bucket, Key, <<>>, dict:store(?MD_DELETED,
                                                                  "true", dict:new())),
             Tombstone = riak_object:set_vclock(Obj0, VClock),
             {ok,C} = riak:local_client(ClientId),

src/riak_kv_wm_raw.hrl

@@ -23,6 +23,7 @@
 -define(MD_LASTMOD,  <<"X-Riak-Last-Modified">>).
 -define(MD_USERMETA, <<"X-Riak-Meta">>).
 -define(MD_INDEX,    <<"index">>).
+-define(MD_DELETED,  <<"X-Riak-Deleted">>).
 
 %% Names of HTTP header fields
 -define(HEAD_CTYPE,           "Content-Type").
@@ -32,6 +33,7 @@
 -define(HEAD_CLIENT,          "X-Riak-ClientId").
 -define(HEAD_USERMETA_PREFIX, "x-riak-meta-").
 -define(HEAD_INDEX_PREFIX,    "x-riak-index-").
+-define(HEAD_DELETED,         "X-Riak-Deleted").
 
 %% Names of JSON fields in bucket properties
 -define(JSON_PROPS,   <<"props">>).

src/riak_kv_wm_utils.erl

@@ -121,6 +121,12 @@ multipart_encode_body(Prefix, Bucket, {MD, V}, APIVersion) ->
              Rfc1123
      end,
      "\r\n",
+     case dict:find(?MD_DELETED, MD) of
+         {ok, "true"} ->
+             [?HEAD_DELETED, ": true\r\n"];
+         error ->
+             []
+     end,
      case dict:find(?MD_USERMETA, MD) of
          {ok, M} ->
             lists:foldl(fun({Hdr,Val},Acc) ->