couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rnew...@apache.org
Subject [34/50] fabric commit: updated refs/heads/windsor-merge-121 to 79e6e2f
Date Fri, 01 Aug 2014 09:12:22 GMT
Remove test for old reduce view behavior

This test is no longer valid because its checking that a complete
message removes other workers from the same range which no longer
happens. This is because fabric_util:stream_start/2 now removes all
workers and returns us a single complete shard ring.

BugzId: 21755


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

Branch: refs/heads/windsor-merge-121
Commit: 42e069a38bd1cd1bc91a8bd8339cc3196762b486
Parents: c44406d
Author: Paul J. Davis <paul.joseph.davis@gmail.com>
Authored: Wed Sep 4 16:23:02 2013 -0500
Committer: Robert Newson <rnewson@apache.org>
Committed: Thu Jul 31 16:07:13 2014 +0100

----------------------------------------------------------------------
 src/fabric_view_reduce.erl | 15 ---------------
 1 file changed, 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-fabric/blob/42e069a3/src/fabric_view_reduce.erl
----------------------------------------------------------------------
diff --git a/src/fabric_view_reduce.erl b/src/fabric_view_reduce.erl
index 42b889b..16d6fb1 100644
--- a/src/fabric_view_reduce.erl
+++ b/src/fabric_view_reduce.erl
@@ -124,21 +124,6 @@ handle_message(complete, Worker, #collector{counters = Counters0} = State)
->
     C1 = fabric_dict:update_counter(Worker, 1, Counters0),
     fabric_view:maybe_send_row(State#collector{counters = C1}).
 
-complete_worker_test() ->
-    meck:new(config),
-    meck:expect(config, get, fun("rexi","server_per_node",_) -> rexi_server end),
-    Shards =
-        mem3_util:create_partition_map("foo",3,3,[node(),node(),node()]),
-    Workers = lists:map(fun(#shard{} = Shard) ->
-                            Ref = make_ref(),
-                            Shard#shard{ref = Ref}
-                        end,
-                        Shards),
-    State = #collector{counters=fabric_dict:init(Workers,0)},
-    {ok, NewState} = handle_message(complete, lists:nth(2,Workers), State),
-    meck:unload(config),
-    ?assertEqual(orddict:size(NewState#collector.counters),length(Workers) - 2).
-
 os_proc_needed(<<"_", _/binary>>) -> false;
 os_proc_needed(_) -> true.
 


Mime
View raw message