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 2016/11/11 23:29:15 UTC
[1/2] fabric commit: updated refs/heads/master to fb4b6b3
Repository: couchdb-fabric
Updated Branches:
refs/heads/master 67978b140 -> fb4b6b3f9
Pass user_ctx down to fabric_rpc
The Options array in fabric_view_all_docs contains the {user_ctx, _}
tuple but we omitted to pass it down to the open_doc command. This
caused several incorrect behaviours for the _users database which has
some special properties for privacy reasons.
COUCHDB-3232
Project: http://git-wip-us.apache.org/repos/asf/couchdb-fabric/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fabric/commit/1ee7c63e
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fabric/tree/1ee7c63e
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fabric/diff/1ee7c63e
Branch: refs/heads/master
Commit: 1ee7c63ebd0daaf0430460adda23560d03a1ba16
Parents: 7cfabb5
Author: Robert Newson <rn...@apache.org>
Authored: Thu Nov 10 23:45:14 2016 -0500
Committer: Robert Newson <rn...@apache.org>
Committed: Thu Nov 10 23:45:14 2016 -0500
----------------------------------------------------------------------
src/fabric_view_all_docs.erl | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-fabric/blob/1ee7c63e/src/fabric_view_all_docs.erl
----------------------------------------------------------------------
diff --git a/src/fabric_view_all_docs.erl b/src/fabric_view_all_docs.erl
index 949cc30..90ff128 100644
--- a/src/fabric_view_all_docs.erl
+++ b/src/fabric_view_all_docs.erl
@@ -50,7 +50,7 @@ go(DbName, Options, #mrargs{keys=undefined} = QueryArgs, Callback, Acc) ->
end;
-go(DbName, _Options, QueryArgs, Callback, Acc0) ->
+go(DbName, Options, QueryArgs, Callback, Acc0) ->
#mrargs{
direction = Dir,
include_docs = IncludeDocs,
@@ -61,7 +61,7 @@ go(DbName, _Options, QueryArgs, Callback, Acc0) ->
} = QueryArgs,
{_, Ref0} = spawn_monitor(fun() -> exit(fabric:get_doc_count(DbName)) end),
SpawnFun = fun(Key) ->
- spawn_monitor(?MODULE, open_doc, [DbName, Doc_Options, Key, IncludeDocs])
+ spawn_monitor(?MODULE, open_doc, [DbName, Options ++ Doc_Options, Key, IncludeDocs])
end,
MaxJobs = all_docs_concurrency(),
Keys1 = case Dir of
[2/2] fabric commit: updated refs/heads/master to fb4b6b3
Posted by rn...@apache.org.
Merge remote-tracking branch 'cloudant/3232-all-docs-ctx'
Project: http://git-wip-us.apache.org/repos/asf/couchdb-fabric/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fabric/commit/fb4b6b3f
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fabric/tree/fb4b6b3f
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fabric/diff/fb4b6b3f
Branch: refs/heads/master
Commit: fb4b6b3f9af259ff30ab4f96d2a1d93a1e85e104
Parents: 67978b1 1ee7c63
Author: Robert Newson <rn...@apache.org>
Authored: Fri Nov 11 18:29:05 2016 -0500
Committer: Robert Newson <rn...@apache.org>
Committed: Fri Nov 11 18:29:05 2016 -0500
----------------------------------------------------------------------
src/fabric_view_all_docs.erl | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------