You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by rn...@apache.org on 2014/08/01 16:34:33 UTC
[12/49] fabric commit: updated refs/heads/windsor-merge to b1c0030
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/6462e847
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fabric/tree/6462e847
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fabric/diff/6462e847
Branch: refs/heads/windsor-merge
Commit: 6462e84765fefb31dee9ca9c2b9d48df2fa6000b
Parents: df9cb85
Author: Paul J. Davis <pa...@gmail.com>
Authored: Wed Sep 4 16:23:02 2013 -0500
Committer: Robert Newson <rn...@apache.org>
Committed: Fri Aug 1 15:33:41 2014 +0100
----------------------------------------------------------------------
src/fabric_view_reduce.erl | 15 ---------------
1 file changed, 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-fabric/blob/6462e847/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.