← Back to branch summary

~ubuntu-branches/ubuntu/maverick/couchdb/maverick

« back to all changes in this revision

Viewing changes to src/couchdb/couch_query_servers.erl

  • Committer: Bazaar Package Importer
  • Author(s): Elliot Murphy
  • Date: 2010-08-16 19:45:48 UTC
  • mfrom: (1.2.10 upstream)
  • Revision ID: james.westby@ubuntu.com-20100816194548-cdm0mjqnbxjt5wa4
Tags: 1.0.1-0ubuntu1
https://launchpad.net/bugs/615224
* Upstream microrelease to address data loss (LP: #615224)
  - Fix data corruption bug COUCHDB-844. Please see
    http://couchdb.apache.org/notice/1.0.1.html for details.
  - Added support for replication via an HTTP/HTTP proxy.
  - Fixed various replicator bugs for interop with older
    CouchDB versions.
  - Show fields saved along with _deleted=true.
    Allows for auditing of deletes.
  - Enable basic-auth popup when required to access the server,
    to prevent people from getting locked out.
  - User interface element for querying stale (cached) views.
* debian/patches/auth_patch.patch dropped, included upstream.
* debian/patches/remove_users.patch dropped, included upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/couchdb/couch_query_servers.erl
143
143
 
144
144
builtin_reduce(_Re, [], _KVs, Acc) ->
145
145
    {ok, lists:reverse(Acc)};
146
 
builtin_reduce(Re, [<<"_sum">>|BuiltinReds], KVs, Acc) ->
 
146
builtin_reduce(Re, [<<"_sum",_/binary>>|BuiltinReds], KVs, Acc) ->
147
147
    Sum = builtin_sum_rows(KVs),
148
148
    builtin_reduce(Re, BuiltinReds, KVs, [Sum|Acc]);
149
 
builtin_reduce(reduce, [<<"_count">>|BuiltinReds], KVs, Acc) ->
 
149
builtin_reduce(reduce, [<<"_count",_/binary>>|BuiltinReds], KVs, Acc) ->
150
150
    Count = length(KVs),
151
151
    builtin_reduce(reduce, BuiltinReds, KVs, [Count|Acc]);
152
 
builtin_reduce(rereduce, [<<"_count">>|BuiltinReds], KVs, Acc) ->
 
152
builtin_reduce(rereduce, [<<"_count",_/binary>>|BuiltinReds], KVs, Acc) ->
153
153
    Count = builtin_sum_rows(KVs),
154
154
    builtin_reduce(rereduce, BuiltinReds, KVs, [Count|Acc]);
155
 
builtin_reduce(Re, [<<"_stats">>|BuiltinReds], KVs, Acc) ->
 
155
builtin_reduce(Re, [<<"_stats",_/binary>>|BuiltinReds], KVs, Acc) ->
156
156
    Stats = builtin_stats(Re, KVs),
157
157
    builtin_reduce(Re, BuiltinReds, KVs, [Stats|Acc]).
158
158