Return-Path: X-Original-To: apmail-couchdb-commits-archive@www.apache.org Delivered-To: apmail-couchdb-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 1B6B518D8A for ; Wed, 10 Feb 2016 22:30:39 +0000 (UTC) Received: (qmail 98700 invoked by uid 500); 10 Feb 2016 22:30:39 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 98662 invoked by uid 500); 10 Feb 2016 22:30:39 -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 98644 invoked by uid 99); 10 Feb 2016 22:30:39 -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; Wed, 10 Feb 2016 22:30:38 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id ADDE3E051D; Wed, 10 Feb 2016 22:30:38 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: chewbranca@apache.org To: commits@couchdb.apache.org Date: Wed, 10 Feb 2016 22:30:39 -0000 Message-Id: <50587e2d35634d44a30ba265e0544c8d@git.apache.org> In-Reply-To: <67a75b045b0a4561a1bc3e19ec305fa5@git.apache.org> References: <67a75b045b0a4561a1bc3e19ec305fa5@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] fabric commit: updated refs/heads/2938-use-ddoc-cache-in-filtered-changes to 8bb97fc Support fetch ddoc logic for filtered changes feeds Project: http://git-wip-us.apache.org/repos/asf/couchdb-fabric/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fabric/commit/8bb97fcf Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fabric/tree/8bb97fcf Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fabric/diff/8bb97fcf Branch: refs/heads/2938-use-ddoc-cache-in-filtered-changes Commit: 8bb97fcf59d44374e4e0516a33293d22a9c2308c Parents: 31be532 Author: Russell Branca Authored: Thu Jan 21 22:55:13 2016 +0000 Committer: Russell Branca Committed: Wed Feb 10 22:21:06 2016 +0000 ---------------------------------------------------------------------- src/fabric_rpc.erl | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb-fabric/blob/8bb97fcf/src/fabric_rpc.erl ---------------------------------------------------------------------- diff --git a/src/fabric_rpc.erl b/src/fabric_rpc.erl index 2554f91..9b88c7f 100644 --- a/src/fabric_rpc.erl +++ b/src/fabric_rpc.erl @@ -47,7 +47,18 @@ changes(DbName, #changes_args{} = Args, StartSeq, DbOptions) -> changes(DbName, [Args], StartSeq, DbOptions); changes(DbName, Options, StartVector, DbOptions) -> set_io_priority(DbName, DbOptions), - #changes_args{dir=Dir} = Args = lists:keyfind(changes_args, 1, Options), + Args0 = lists:keyfind(changes_args, 1, Options), + #changes_args{dir=Dir, filter_fun=Filter} = Args0, + Args = case Filter of + {fetch, Style, Req, {DDocId, Rev}, FName} -> + {ok, DDoc} = ddoc_cache:open_doc(mem3:dbname(DbName), DDocId, Rev), + Args0#changes_args{ + filter_fun={custom, Style, Req, DDoc, FName} + }; + _ -> + Args0 + end, + DbOpenOptions = Args#changes_args.db_open_options ++ DbOptions, case get_or_create_db(DbName, DbOpenOptions) of {ok, Db} ->