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 BF5A410FE9 for ; Mon, 10 Feb 2014 20:07:03 +0000 (UTC) Received: (qmail 6073 invoked by uid 500); 10 Feb 2014 20:05:42 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 5734 invoked by uid 500); 10 Feb 2014 20:05:32 -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 4570 invoked by uid 99); 10 Feb 2014 20:05:01 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 10 Feb 2014 20:05:01 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 9E450922655; Mon, 10 Feb 2014 20:05:01 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: benoitc@apache.org To: commits@couchdb.apache.org Date: Mon, 10 Feb 2014 20:05:05 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [05/50] couch commit: updated refs/remotes/origin/import to 09c6556 Fix handling of initial accumulator for objects BugzID: 14798 Project: http://git-wip-us.apache.org/repos/asf/couchdb-couch/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb-couch/commit/e5e5880b Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch/tree/e5e5880b Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch/diff/e5e5880b Branch: refs/remotes/origin/import Commit: e5e5880b27218a067ba49def549c8b311cb33418 Parents: 5a2ec4f Author: Adam Kocoloski Authored: Mon Dec 10 14:29:30 2012 -0500 Committer: Paul J. Davis Committed: Tue Feb 4 17:03:23 2014 -0600 ---------------------------------------------------------------------- src/couch_query_servers.erl | 2 ++ 1 file changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/e5e5880b/src/couch_query_servers.erl ---------------------------------------------------------------------- diff --git a/src/couch_query_servers.erl b/src/couch_query_servers.erl index e420ce9..4e4f938 100644 --- a/src/couch_query_servers.erl +++ b/src/couch_query_servers.erl @@ -211,6 +211,8 @@ builtin_reduce(Re, [<<"_stats",_/binary>>|BuiltinReds], KVs, Acc) -> builtin_sum_rows(KVs) -> lists:foldl(fun([_Key, Value], Acc) -> sum_values(Value, Acc) end, 0, KVs). +sum_values({Props}, 0) -> + {Props}; sum_values({Props}, {AccProps}) -> {sum_objects(lists:sort(Props), lists:sort(AccProps))}; sum_values(Value, Acc) when is_number(Value), is_number(Acc) ->