summaryrefslogtreecommitdiff
path: root/src/couchdb/couch_db.erl
diff options
context:
space:
mode:
authorDamien F. Katz <damien@apache.org>2008-06-09 19:55:34 +0000
committerDamien F. Katz <damien@apache.org>2008-06-09 19:55:34 +0000
commitbb4adba508b7abdc09850fc41de3479a0b2d6bb0 (patch)
tree67db07b305a634d9bd4fcea61df704f888637ca4 /src/couchdb/couch_db.erl
parent2f56905cea40818e2517d6eba24765d3bdf3252d (diff)
Changed name of 'combine' phase of reduce to 'rereduce', to avoid confusion.
git-svn-id: https://svn.apache.org/repos/asf/incubator/couchdb/trunk@665852 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/couchdb/couch_db.erl')
-rw-r--r--src/couchdb/couch_db.erl4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/couchdb/couch_db.erl b/src/couchdb/couch_db.erl
index 844c9260..66b18976 100644
--- a/src/couchdb/couch_db.erl
+++ b/src/couchdb/couch_db.erl
@@ -440,13 +440,13 @@ btree_by_id_join(Id, {Seq, Deleted, Tree}) ->
btree_by_id_reduce(reduce, FullDocInfos) ->
% count the number of deleted documents
length([1 || #full_doc_info{deleted=false} <- FullDocInfos]);
-btree_by_id_reduce(combine, Reds) ->
+btree_by_id_reduce(rereduce, Reds) ->
lists:sum(Reds).
btree_by_seq_reduce(reduce, DocInfos) ->
% count the number of deleted documents
length(DocInfos);
-btree_by_seq_reduce(combine, Reds) ->
+btree_by_seq_reduce(rereduce, Reds) ->
lists:sum(Reds).
init_db(DbName, Filepath, Fd, Header) ->