From bb4adba508b7abdc09850fc41de3479a0b2d6bb0 Mon Sep 17 00:00:00 2001
From: "Damien F. Katz" <damien@apache.org>
Date: Mon, 9 Jun 2008 19:55:34 +0000
Subject: 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
---
 src/couchdb/couch_btree.erl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/couchdb/couch_btree.erl')

diff --git a/src/couchdb/couch_btree.erl b/src/couchdb/couch_btree.erl
index f01234c1..b9374f91 100644
--- a/src/couchdb/couch_btree.erl
+++ b/src/couchdb/couch_btree.erl
@@ -64,7 +64,7 @@ final_reduce(Reduce, {[], []}) ->
 final_reduce(_Bt, {[], [Red]}) ->
     Red;
 final_reduce(Reduce, {[], Reductions}) ->
-    Reduce(combine, Reductions);
+    Reduce(rereduce, Reductions);
 final_reduce(Reduce, {KVs, Reductions}) ->
     Red = Reduce(reduce, KVs),
     final_reduce(Reduce, {[], [Red | Reductions]}).
@@ -289,7 +289,7 @@ modify_node(Bt, RootPointerInfo, Actions, QueryOutput) ->
 reduce_node(#btree{reduce=nil}, _NodeType, _NodeList) ->
     [];
 reduce_node(#btree{reduce=R}, kp_node, NodeList) ->
-    R(combine, [Red || {_K, {_P, Red}} <- NodeList]);
+    R(rereduce, [Red || {_K, {_P, Red}} <- NodeList]);
 reduce_node(#btree{reduce=R}, kv_node, NodeList) ->
     R(reduce, NodeList).
 
@@ -658,7 +658,7 @@ test_btree(KeyValues) ->
     ReduceFun =
         fun(reduce, KVs) ->
             length(KVs);
-        (combine, Reds) ->
+        (rereduce, Reds) ->
             lists:sum(Reds)
         end,
     Btree1 = set_options(Btree, [{reduce, ReduceFun}]),
-- 
cgit v1.2.3