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 7D562175FF for ; Fri, 31 Oct 2014 19:53:19 +0000 (UTC) Received: (qmail 6126 invoked by uid 500); 31 Oct 2014 19:53:18 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 6025 invoked by uid 500); 31 Oct 2014 19:53:18 -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 5876 invoked by uid 99); 31 Oct 2014 19:53:18 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 31 Oct 2014 19:53:18 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 891B7927ACC; Fri, 31 Oct 2014 19:53:18 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: bbastian@apache.org To: commits@couchdb.apache.org Date: Fri, 31 Oct 2014 19:53:52 -0000 Message-Id: <6dad57b480964c4c9ab13bbd5cc97540@git.apache.org> In-Reply-To: <695c7c23941a44a0938af77efbf99d8b@git.apache.org> References: <695c7c23941a44a0938af77efbf99d8b@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [37/41] couch-mrview commit: updated refs/heads/master to 28e51f3 Update expected return of couch_mrview_util:get_view Project: http://git-wip-us.apache.org/repos/asf/couchdb-couch-mrview/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb-couch-mrview/commit/28e51f3f Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch-mrview/tree/28e51f3f Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch-mrview/diff/28e51f3f Branch: refs/heads/master Commit: 28e51f3f8cfefce6300243ec6ce1af35d4f454ea Parents: e928480 Author: Benjamin Bastian Authored: Thu Oct 30 13:16:44 2014 -0700 Committer: Benjamin Bastian Committed: Thu Oct 30 19:28:42 2014 -0700 ---------------------------------------------------------------------- src/couch_mrview.erl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb-couch-mrview/blob/28e51f3f/src/couch_mrview.erl ---------------------------------------------------------------------- diff --git a/src/couch_mrview.erl b/src/couch_mrview.erl index f6dec66..26d1cb2 100644 --- a/src/couch_mrview.erl +++ b/src/couch_mrview.erl @@ -215,8 +215,8 @@ trigger_update(Db, DDoc, UpdateSeq) -> %% get informations on a view get_view_info(Db, DDoc, VName) -> - {ok, {_, View}, _, _Args} = couch_mrview_util:get_view(Db, DDoc, VName, - #mrargs{}), + {ok, {_, View, _}, _, _Args} = couch_mrview_util:get_view(Db, DDoc, VName, + #mrargs{}), %% get the total number of rows {ok, TotalRows} = couch_mrview_util:get_row_count(View),