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/28 14:23:08 UTC
[48/50] mem3 commit: updated refs/heads/master to 64c0c74
Update mem3_rebalance to work with couch_mrview
Project: http://git-wip-us.apache.org/repos/asf/couchdb-mem3/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-mem3/commit/b3ddfca9
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-mem3/tree/b3ddfca9
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-mem3/diff/b3ddfca9
Branch: refs/heads/master
Commit: b3ddfca9ddf12061cf9202026da3ede33d78ce07
Parents: ff02b9a
Author: Paul J. Davis <pa...@gmail.com>
Authored: Sun Aug 17 13:54:51 2014 -0500
Committer: Paul J. Davis <pa...@gmail.com>
Committed: Sun Aug 17 13:54:51 2014 -0500
----------------------------------------------------------------------
src/mem3_rebalance.erl | 29 ++++++++++++++---------------
1 file changed, 14 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-mem3/blob/b3ddfca9/src/mem3_rebalance.erl
----------------------------------------------------------------------
diff --git a/src/mem3_rebalance.erl b/src/mem3_rebalance.erl
index 3972d89..1c1ed64 100644
--- a/src/mem3_rebalance.erl
+++ b/src/mem3_rebalance.erl
@@ -458,24 +458,23 @@ shard_count_by_node(PrevMoves) ->
shard_count_view() ->
%% TODO rewrite CouchDB's internal view API. Wow!
{ok, Db} = couch_db:open(<<"dbs">>, []),
- {ok, DDoc} = couch_db:open_doc(Db, <<"_design/rebalance">>, []),
- Group0 = couch_view_group:design_doc_to_view_group(DDoc),
- {ok, Pid} = gen_server:call(couch_view, {get_group_server, <<"dbs">>, Group0}),
- {ok, Group} = couch_view_group:request_group(Pid, 0),
- Lang = couch_view_group:get_language(Group),
- Views = couch_view_group:get_views(Group),
- Ref = erlang:monitor(process, couch_view_group:get_fd(Group)),
- {IRed, View} = fabric_view:extract_view(Pid, <<"count_by_node">>, Views, reduce),
- ReduceView = {reduce, IRed, Lang, View},
- Options = [{key_group_level, exact}],
- Fold = fun(Node, Count, Acc) -> {ok, [{Node, Count} | Acc]} end,
- %% Workaround for problems where we hold onto bad collators in the shell
- erlang:erase(couch_drv_port),
- {ok, Map} = couch_view:fold_reduce(ReduceView, Fold, [], Options),
+ DDocId = <<"_design/rebalance">>,
+ Fold = fun view_cb/2,
+ Args = [{group_level, exact}],
+ {ok, Map} = couch_mrview:query_view(
+ Db, DDocId, <<"count_by_node">>, Fold, [], Args),
erlang:put(shard_count_by_node, {os:timestamp(), Map}),
- erlang:demonitor(Ref),
Map.
+view_cb({meta, _}, Acc) ->
+ {ok, Acc};
+view_cb({row, Row}, Acc) ->
+ {key, Node} = lists:keyfind(key, 1, Row),
+ {value, Count} = lists:keyfind(value, 1, Row),
+ {ok, [{Node, Count} | Acc]};
+view_cb(complete, Acc) ->
+ {ok, lists:reverse(Acc)}.
+
print({Op, Shard, TargetNode} = Operation) ->
{match, [SourceId, Cluster]} = re:run(
atom_to_list(Shard#shard.node),