You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by rn...@apache.org on 2013/06/29 17:17:44 UTC
[03/50] [abbrv] git commit: updated refs/heads/1843-feature-bigcouch
to cba2e81
User aggregates have binary keys
BugzID: 14330
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/816bf803
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/816bf803
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/816bf803
Branch: refs/heads/1843-feature-bigcouch
Commit: 816bf803db57530cfe38e3baea3487b1f1c1ecf1
Parents: 99570a8
Author: Adam Kocoloski <ad...@cloudant.com>
Authored: Thu Aug 16 11:10:24 2012 -0400
Committer: Paul J. Davis <pa...@gmail.com>
Committed: Wed Mar 20 06:02:50 2013 -0500
----------------------------------------------------------------------
src/couch/src/couch_query_servers.erl | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/816bf803/src/couch/src/couch_query_servers.erl
----------------------------------------------------------------------
diff --git a/src/couch/src/couch_query_servers.erl b/src/couch/src/couch_query_servers.erl
index fb7f354..eb41e27 100644
--- a/src/couch/src/couch_query_servers.erl
+++ b/src/couch/src/couch_query_servers.erl
@@ -236,11 +236,11 @@ builtin_stats(reduce, [[_,First]|Rest]) ->
{S+V, C+1, erlang:min(Mi,V), erlang:max(Ma,V), Sq+(V*V)};
([_K,{PreRed}], {S,C,Mi,Ma,Sq}) when is_list(PreRed) ->
{
- S + get_number(sum, PreRed),
- C + get_number(count, PreRed),
- erlang:min(get_number(min, PreRed), Mi),
- erlang:max(get_number(max, PreRed), Ma),
- Sq + get_number(sumsqr, PreRed)
+ S + get_number(<<"sum">>, PreRed),
+ C + get_number(<<"count">>, PreRed),
+ erlang:min(get_number(<<"min">>, PreRed), Mi),
+ erlang:max(get_number(<<"max">>, PreRed), Ma),
+ Sq + get_number(<<"sumsqr">>, PreRed)
};
([_K,V], _) ->
Msg = io_lib:format("non-numeric _stats input: ~w", [V]),
@@ -262,11 +262,11 @@ build_initial_accumulator(X) when is_number(X) ->
{X, 1, X, X, X*X};
build_initial_accumulator({Props}) ->
{
- get_number(sum, Props),
- get_number(count, Props),
- get_number(min, Props),
- get_number(max, Props),
- get_number(sumsqr, Props)
+ get_number(<<"sum">>, Props),
+ get_number(<<"count">>, Props),
+ get_number(<<"min">>, Props),
+ get_number(<<"max">>, Props),
+ get_number(<<"sumsqr">>, Props)
};
build_initial_accumulator(Else) ->
Msg = io_lib:format("non-numeric _stats input: ~w", [Else]),