Commits

jus...@basho.com  committed c9e6505 Merge

merge

  • Participants
  • Parent commits 2fa540b, ec364af

Comments (0)

Files changed (2)

 -  better mapreduce docs
 -  good documents for riak_object and reconciliation
 -  better riak_object tests
--  investigate use of global:trans/global:set_lock instead of mnesia locks -
-   mnesia locks use ets tables and are therefore probably less efficient.
+-  better detection of disconnected eventers
 

File src/riak_vnode.erl

     {noreply, State};
 handle_cast({put, FSM_pid, Storekey, RObj, ReqID},
             State=#state{mapcache=Cache,idx=Idx}) ->
-    riak_eventer:notify(riak_vnode, put, ReqID),
+    riak_eventer:notify(riak_vnode, put, {ReqID, Idx}),
     gen_fsm:send_event(FSM_pid, {w, Idx, ReqID}),
     do_put(FSM_pid, Storekey, RObj, ReqID, State),
     {noreply, State#state{mapcache=dict:erase(Storekey,Cache)}};
-handle_cast({get, FSM_pid, Storekey, ReqID}, State) ->
-    riak_eventer:notify(riak_vnode, get, ReqID),
+handle_cast({get, FSM_pid, Storekey, ReqID}, State=#state{idx=Idx}) ->
+    riak_eventer:notify(riak_vnode, get, {ReqID, Idx}),
     do_get(FSM_pid, Storekey, ReqID, State),
     {noreply, State};
-handle_cast({delete, Client, Storekey, ReqID}, State) ->
-    riak_eventer:notify(riak_vnode, delete, ReqID),
+handle_cast({delete, Client, Storekey, ReqID}, State=#state{idx=Idx}) ->
+    riak_eventer:notify(riak_vnode, delete, {ReqID, Idx}),
     do_delete(Client, Storekey, ReqID, State),
     {noreply, State}.