Commits

Anonymous committed e84c7af Merge

merge

  • Participants
  • Parent commits d11ed4b, 276425e

Comments (0)

Files changed (2)

File src/riak_delete.erl

 
 -export([delete/6]).
 
-%% @spec delete(riak_object:bucket(), riak_object:key(), RW :: integer(),
+%% @spec delete(request_id(), riak_object:bucket(), riak_object:key(), RW :: integer(),
 %%              TimeoutMillisecs :: integer(), Client :: pid()) -> term()
 %% @doc Delete the object at Bucket/Key.  Direct return value is uninteresting,
 %%      see riak_client:delete/3 for expected gen_server replies to Client.

File src/riak_util.erl

     Id = erlang:phash2([Y,Mo,D,H,Mi,S,node(),RemoteNode,NowPart]),
     <<Id:32>>.
 
-%% @spec chash_key(BKey :: riak_object:bkey()) -> chash:index().
+%% @spec chash_key(BKey :: riak_object:bkey()) -> chash:index()
 %% @doc Create a binary used for determining replica placement.
 chash_key({Bucket,Key}) ->
     BucketProps = riak_bucket:get_bucket(Bucket),
     {chash_keyfun, {M, F}} = proplists:lookup(chash_keyfun, BucketProps),
     M:F({Bucket,Key}).
 
-%% @spec chash_std_keyfun(BKey :: riak_object:bkey()) -> chash:index().
+%% @spec chash_std_keyfun(BKey :: riak_object:bkey()) -> chash:index()
 %% @doc Default object/ring hashing fun, direct passthrough of bkey.
 chash_std_keyfun({Bucket, Key}) -> chash:key_of({Bucket, Key}).
     
-%% @spec chash_bucketonly_keyfun(BKey :: riak_object:bkey()) -> chash:index().
+%% @spec chash_bucketonly_keyfun(BKey :: riak_object:bkey()) -> chash:index()
 %% @doc Object/ring hashing fun that ignores Key, only uses Bucket.
 chash_bucketonly_keyfun({Bucket, _Key}) -> chash:key_of(Bucket).