You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ch...@apache.org on 2014/02/28 20:38:01 UTC
fabric commit: updated refs/heads/1993-bigcouch-couch-mrview to
acc45b4
Repository: couchdb-fabric
Updated Branches:
refs/heads/1993-bigcouch-couch-mrview e1fdae4ef -> acc45b411
Switch fabric_rpc:group_info to use couch_mrview:get_info
Project: http://git-wip-us.apache.org/repos/asf/couchdb-fabric/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fabric/commit/acc45b41
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fabric/tree/acc45b41
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fabric/diff/acc45b41
Branch: refs/heads/1993-bigcouch-couch-mrview
Commit: acc45b41122785814ebeb3b13df7a4d1e71e6974
Parents: e1fdae4
Author: Russell Branca <ch...@apache.org>
Authored: Fri Feb 28 11:38:11 2014 -0800
Committer: Russell Branca <ch...@apache.org>
Committed: Fri Feb 28 11:38:11 2014 -0800
----------------------------------------------------------------------
src/fabric_group_info.erl | 5 ++---
src/fabric_rpc.erl | 5 ++---
2 files changed, 4 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-fabric/blob/acc45b41/src/fabric_group_info.erl
----------------------------------------------------------------------
diff --git a/src/fabric_group_info.erl b/src/fabric_group_info.erl
index 135090f..5325f76 100644
--- a/src/fabric_group_info.erl
+++ b/src/fabric_group_info.erl
@@ -22,10 +22,9 @@ go(DbName, GroupId) when is_binary(GroupId) ->
{ok, DDoc} = fabric:open_doc(DbName, GroupId, []),
go(DbName, DDoc);
-go(DbName, #doc{} = DDoc) ->
- Group = couch_view_group:design_doc_to_view_group(DDoc),
+go(DbName, #doc{id=DDocId}) ->
Shards = mem3:shards(DbName),
- Workers = fabric_util:submit_jobs(Shards, group_info, [Group]),
+ Workers = fabric_util:submit_jobs(Shards, group_info, [DDocId]),
RexiMon = fabric_util:create_monitors(Shards),
Acc0 = {fabric_dict:init(Workers, nil), []},
try
http://git-wip-us.apache.org/repos/asf/couchdb-fabric/blob/acc45b41/src/fabric_rpc.erl
----------------------------------------------------------------------
diff --git a/src/fabric_rpc.erl b/src/fabric_rpc.erl
index e956974..5727f6d 100644
--- a/src/fabric_rpc.erl
+++ b/src/fabric_rpc.erl
@@ -136,9 +136,8 @@ update_docs(DbName, Docs0, Options) ->
Docs = make_att_readers(Docs0),
with_db(DbName, Options, {couch_db, update_docs, [Docs, Options, X]}).
-group_info(DbName, Group0) ->
- {ok, Pid} = gen_server:call(couch_view, {get_group_server, DbName, Group0}),
- rexi:reply(couch_view_group:request_group_info(Pid)).
+group_info(DbName, DDocId) ->
+ with_db(DbName, [], {couch_mrview, get_info, [DDocId]}).
reset_validation_funs(DbName) ->
case get_or_create_db(DbName, []) of