Browse files

Merge pull request #542 from basho/bugfix/sdc/dialyzer-2

Minor cleanups
  • Loading branch information...
2 parents f40aab1 + b21b0f8 commit be773dd482e2c66459498c49b6797b03bd05f354 @seancribbs seancribbs committed Mar 1, 2014
Showing with 6 additions and 6 deletions.
  1. +1 −1 src/riak_core_apl.erl
  2. +5 −0 src/riak_core_capability.erl
  3. +0 −5 src/riak_core_vnode.erl
View
2 src/riak_core_apl.erl
@@ -42,7 +42,7 @@
-type preflist_ann() :: [{{index(), node()}, primary|fallback}].
-type iterator() :: term().
-type chashbin() :: term().
--type docidx() :: <<_:160>>.
+-type docidx() :: chash:index().
%% Return preflist of all active primary nodes (with no
%% substituion of fallbacks). Used to simulate a
View
5 src/riak_core_capability.erl
@@ -409,6 +409,11 @@ add_supported_to_ring(Node, Supported, Ring) ->
%% list of application env overrides, and the current view of all node's
%% supported capabilities, determine the most preferred mode for each capability
%% that is supported by all nodes.
+-spec preferred_modes([{capability(), [mode()]}],
+ [{node(), [{capability(), [mode()]}]}],
+ registered(),
+ [{capability(), [mode()]}])
+ -> [{capability(), mode()}].
preferred_modes(MyCaps, Capabilities, Registered, Override) ->
N1 = reformat_capabilities(Registered, Capabilities),
N2 = intersect_capabilities(N1),
View
5 src/riak_core_vnode.erl
@@ -376,11 +376,6 @@ vnode_handoff_command(Sender, Request, ForwardTo,
riak_core_vnode_worker_pool:handle_work(Pool, Work, From),
continue(State, NewModState);
{forward, NewModState} ->
- %% FIXME: vnode_forward returns a gen_fsm state return
- %% value by calling continue/1 internally. Questions:
- %% 1) Why are we not passing the NewModState to vnode_forward?
- %% 2) If vnode_forward produces the gen_fsm state return
- %% type, why not use it?
case HOType of
%% resize op and transfer ongoing
resize_transfer -> vnode_forward(resize, ForwardTo, Sender,

0 comments on commit be773dd

Please sign in to comment.