diff options
| author | Damien F. Katz <damien@apache.org> | 2008-06-09 19:55:34 +0000 |
|---|---|---|
| committer | Damien F. Katz <damien@apache.org> | 2008-06-09 19:55:34 +0000 |
| commit | bb4adba508b7abdc09850fc41de3479a0b2d6bb0 (patch) | |
| tree | 67db07b305a634d9bd4fcea61df704f888637ca4 /src/couchdb/couch_query_servers.erl | |
| parent | 2f56905cea40818e2517d6eba24765d3bdf3252d (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_query_servers.erl')
| -rw-r--r-- | src/couchdb/couch_query_servers.erl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/couchdb/couch_query_servers.erl b/src/couchdb/couch_query_servers.erl index 1fb2462c..ffacbc26 100644 --- a/src/couchdb/couch_query_servers.erl +++ b/src/couchdb/couch_query_servers.erl @@ -17,7 +17,7 @@ -export([init/1, terminate/2, handle_call/3, handle_cast/2, handle_info/2,code_change/3,stop/0]). -export([start_doc_map/2, map_docs/2, stop_doc_map/1]). --export([reduce/3, combine/3]). +-export([reduce/3, rereduce/3]). -export([test/0, test/1]). -include("couch_db.hrl"). @@ -141,15 +141,15 @@ group_reductions_results(List) -> [Heads | group_reductions_results(Tails)] end. -combine(_Lang, [], _ReducedValues) -> +rereduce(_Lang, [], _ReducedValues) -> {ok, []}; -combine(Lang, RedSrcs, ReducedValues) -> +rereduce(Lang, RedSrcs, ReducedValues) -> Port = get_linked_port(Lang), Grouped = group_reductions_results(ReducedValues), Results = lists:zipwith( fun(FunSrc, Values) -> {true, {Result}} = - prompt(Port, {"combine", {FunSrc}, list_to_tuple(Values)}), + prompt(Port, {"rereduce", {FunSrc}, list_to_tuple(Values)}), Result end, RedSrcs, Grouped), |