basho / riak / changeset / e1357f00129f

@@ -312,6 +312,17 @@ syntactic_put_merge(Mod, ModState, BKey,
     end.
 %% @private
 get_merkle(_State=#state{mod=Mod,modstate=ModState}) ->
     KeyList = Mod:list(ModState),
     Merk0 = merkerl:build_tree([]),
     get_merk(Mod,ModState,KeyList,Merk0).
 %% @private
 get_merk(_Mod,_ModState,[],Merk) -> Merk;
 get_merk(Mod,ModState,[BKey|KeyList],Merk) ->
     V = Mod:get(ModState,BKey), % normally, V = {ok,BinObj}
     get_merk(Mod,ModState,KeyList,merkerl:insert({BKey,erlang:phash2(V)},Merk)).
 %% @private
 get_vclocks(KeyList,_State=#state{mod=Mod,modstate=ModState}) ->
     [{BKey, get_vclock(BKey,Mod,ModState)} || BKey <- KeyList].
 %% @private
@@ -329,6 +340,9 @@ do_fold(Fun, Acc0, _State=#state{mod=Mod
 code_change(_OldVsn, StateName, State, _Extra) -> {ok, StateName, State}.
 %% @private
 handle_event({get_merkle, From}, StateName, State) ->
     gen_server2:reply(From, get_merkle(State)),
     {next_state, StateName, State, ?TIMEOUT};
 handle_event({get_vclocks, From, KeyList}, StateName, State) ->
     gen_server2:reply(From, get_vclocks(KeyList, State)),
     {next_state, StateName, State, ?TIMEOUT};