Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 40436200BE0 for ; Sat, 12 Nov 2016 00:29:17 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 3D4B8160AF6; Fri, 11 Nov 2016 23:29:17 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 8D419160B01 for ; Sat, 12 Nov 2016 00:29:16 +0100 (CET) Received: (qmail 2848 invoked by uid 500); 11 Nov 2016 23:29:15 -0000 Mailing-List: contact commits-help@couchdb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@couchdb.apache.org Delivered-To: mailing list commits@couchdb.apache.org Received: (qmail 2829 invoked by uid 99); 11 Nov 2016 23:29:15 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 11 Nov 2016 23:29:15 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 8ADF4E0362; Fri, 11 Nov 2016 23:29:15 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: rnewson@apache.org To: commits@couchdb.apache.org Date: Fri, 11 Nov 2016 23:29:15 -0000 Message-Id: <745ff1e59f4a4fd98521eb1c83792c07@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/2] fabric commit: updated refs/heads/master to fb4b6b3 archived-at: Fri, 11 Nov 2016 23:29:17 -0000 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 Authored: Thu Nov 10 23:45:14 2016 -0500 Committer: Robert Newson 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