You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ko...@apache.org on 2017/03/01 16:38:23 UTC

[25/50] fabric commit: updated refs/heads/2971-count-distinct to 5d18415

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/2971-count-distinct
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