couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kxe...@apache.org
Subject [3/4] fabric commit: updated refs/heads/master to ba27f81
Date Tue, 12 May 2015 19:55:40 GMT
Rename variables for clarification of intend

COUCHDB-2526


Project: http://git-wip-us.apache.org/repos/asf/couchdb-fabric/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fabric/commit/06d1efc0
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fabric/tree/06d1efc0
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fabric/diff/06d1efc0

Branch: refs/heads/master
Commit: 06d1efc0b0a083b75d691079f7da752c989d0c84
Parents: 6351140
Author: ILYA Khlopotov <iilyak@ca.ibm.com>
Authored: Tue Dec 23 07:54:02 2014 -0800
Committer: ILYA Khlopotov <iilyak@ca.ibm.com>
Committed: Thu Mar 26 05:39:58 2015 -0700

----------------------------------------------------------------------
 src/fabric_group_info.erl | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-fabric/blob/06d1efc0/src/fabric_group_info.erl
----------------------------------------------------------------------
diff --git a/src/fabric_group_info.erl b/src/fabric_group_info.erl
index 4d81200..20047c5 100644
--- a/src/fabric_group_info.erl
+++ b/src/fabric_group_info.erl
@@ -39,29 +39,30 @@ go(DbName, #doc{id=DDocId}) ->
         rexi_monitor:stop(RexiMon)
     end.
 
-handle_message({rexi_DOWN, _, {_,NodeRef},_}, _Shard, {Counters, Acc, U}) ->
+handle_message({rexi_DOWN, _, {_,NodeRef},_}, _Shard,
+        {Counters, Acc, Ushards}) ->
     case fabric_util:remove_down_workers(Counters, NodeRef) of
     {ok, NewCounters} ->
-        {ok, {NewCounters, Acc, U}};
+        {ok, {NewCounters, Acc, Ushards}};
     error ->
         {error, {nodedown, <<"progress not possible">>}}
     end;
 
-handle_message({rexi_EXIT, Reason}, Shard, {Counters, Acc, U}) ->
+handle_message({rexi_EXIT, Reason}, Shard, {Counters, Acc, Ushards}) ->
     NewCounters = lists:keydelete(Shard, #shard.ref, Counters),
     case fabric_view:is_progress_possible(NewCounters) of
     true ->
-        {ok, {NewCounters, Acc, U}};
+        {ok, {NewCounters, Acc, Ushards}};
     false ->
         {error, Reason}
     end;
 
-handle_message({ok, Info}, Shard, {Counters0, Acc, U}) ->
-    NewAcc = append_result(Info, Shard, Acc, U),
+handle_message({ok, Info}, Shard, {Counters0, Acc, Ushards}) ->
+    NewAcc = append_result(Info, Shard, Acc, Ushards),
     Counters = fabric_dict:store(Shard, ok, Counters0),
     case is_complete(Counters) of
     false ->
-        {ok, {Counters, NewAcc, U}};
+        {ok, {Counters, NewAcc, Ushards}};
     true ->
         Pending = aggregate_pending(NewAcc),
         Infos = get_infos(NewAcc),


Mime
View raw message