couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rnew...@apache.org
Subject [07/50] fabric commit: updated refs/heads/windsor-merge-121 to 79e6e2f
Date Fri, 01 Aug 2014 09:11:55 GMT
Separate is_owner logic from owner_of


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

Branch: refs/heads/windsor-merge-121
Commit: 2c341cf65309ee463d09c03b0a609a4cc407f258
Parents: 1f91869
Author: Robert Newson <robert.newson@cloudant.com>
Authored: Sat Aug 10 19:05:49 2013 +0100
Committer: Robert Newson <rnewson@apache.org>
Committed: Thu Jul 31 10:53:37 2014 +0100

----------------------------------------------------------------------
 src/fabric_rpc.erl | 31 +++++++++++++++----------------
 1 file changed, 15 insertions(+), 16 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-fabric/blob/2c341cf6/src/fabric_rpc.erl
----------------------------------------------------------------------
diff --git a/src/fabric_rpc.erl b/src/fabric_rpc.erl
index 81b747b..0f426d3 100644
--- a/src/fabric_rpc.erl
+++ b/src/fabric_rpc.erl
@@ -373,7 +373,7 @@ calculate_start_seq(_Db, Seq) when is_integer(Seq) ->
 calculate_start_seq(Db, {Seq, Uuid, Node}) ->
     case couch_db:get_uuid(Db) == Uuid of
         true ->
-            case owner(Node, Seq, couch_db:get_epochs(Db)) of
+            case is_owner(Node, Seq, couch_db:get_epochs(Db)) of
                 true -> Seq;
                 false -> 0
             end;
@@ -383,16 +383,15 @@ calculate_start_seq(Db, {Seq, Uuid, Node}) ->
             0
     end.
 
-owner(Node, Seq, Epochs) ->
-    owner(Node, Seq, Epochs, infinity).
+is_owner(Node, Seq, Epochs) ->
+    Node =:= owner_of(Seq, Epochs).
 
-owner(_Node, _Seq, [], _HighSeq) ->
-    false;
-owner(Node, Seq, [{EpochNode, EpochSeq} | _Rest], HighSeq)
-  when Node =:= EpochNode andalso Seq < HighSeq andalso Seq > EpochSeq ->
-    true;
-owner(Node, Seq, [{_EpochNode, EpochSeq} | Rest], _HighSeq) ->
-    owner(Node, Seq, Rest, EpochSeq).
+owner_of(_Seq, []) ->
+    undefined;
+owner_of(Seq, [{EpochNode, EpochSeq} | _Rest]) when Seq > EpochSeq ->
+    EpochNode;
+owner_of(Seq, [_ | Rest]) ->
+    owner_of(Seq, Rest).
 
 -ifdef(TEST).
 -include_lib("eunit/include/eunit.hrl").
@@ -411,11 +410,11 @@ calculate_start_seq_test() ->
     %% return integer if we didn't get a vector.
     ?assertEqual(4, calculate_start_seq(#db{}, 4)).
 
-owner_test() ->
-    ?assertNot(owner(foo, 1, [])),
-    ?assert(owner(foo, 1, [{foo, 1}])),
-    ?assert(owner(foo, 50, [{bar, 100}, {foo, 1}])),
-    ?assert(owner(foo, 50, [{baz, 200}, {bar, 100}, {foo, 1}])),
-    ?assert(owner(bar, 150, [{baz, 200}, {bar, 100}, {foo, 1}])).
+is_owner_test() ->
+    ?assertNot(is_owner(foo, 1, [])),
+    ?assert(is_owner(foo, 1, [{foo, 1}])),
+    ?assert(is_owner(foo, 50, [{bar, 100}, {foo, 1}])),
+    ?assert(is_owner(foo, 50, [{baz, 200}, {bar, 100}, {foo, 1}])),
+    ?assert(is_owner(bar, 150, [{baz, 200}, {bar, 100}, {foo, 1}])).
 
 -endif.


Mime
View raw message