You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ja...@apache.org on 2008/06/01 20:27:31 UTC
svn commit: r662262 - in /incubator/couchdb/branches/runtimeconfig: ./
share/www/script/couch.js share/www/script/couch_tests.js
src/couchdb/couch_btree.erl src/couchdb/couch_httpd.erl
src/couchdb/couch_view.erl
Author: jan
Date: Sun Jun 1 11:27:31 2008
New Revision: 662262
URL: http://svn.apache.org/viewvc?rev=662262&view=rev
Log:
Merged revisions 661476 via svnmerge from
https://jan@svn.apache.org/repos/asf/incubator/couchdb/trunk
Modified:
incubator/couchdb/branches/runtimeconfig/ (props changed)
incubator/couchdb/branches/runtimeconfig/share/www/script/couch.js
incubator/couchdb/branches/runtimeconfig/share/www/script/couch_tests.js
incubator/couchdb/branches/runtimeconfig/src/couchdb/couch_btree.erl
incubator/couchdb/branches/runtimeconfig/src/couchdb/couch_httpd.erl
incubator/couchdb/branches/runtimeconfig/src/couchdb/couch_view.erl
Propchange: incubator/couchdb/branches/runtimeconfig/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Sun Jun 1 11:27:31 2008
@@ -1 +1 @@
-/incubator/couchdb/trunk:1-660594
+/incubator/couchdb/trunk:1-662261
Modified: incubator/couchdb/branches/runtimeconfig/share/www/script/couch.js
URL: http://svn.apache.org/viewvc/incubator/couchdb/branches/runtimeconfig/share/www/script/couch.js?rev=662262&r1=662261&r2=662262&view=diff
==============================================================================
--- incubator/couchdb/branches/runtimeconfig/share/www/script/couch.js [utf-8] (original)
+++ incubator/couchdb/branches/runtimeconfig/share/www/script/couch.js [utf-8] Sun Jun 1 11:27:31 2008
@@ -88,6 +88,7 @@
if (req.status != 201)
throw result;
for(var i in docs) {
+ docs[i]._id = result.new_revs[i].id;
docs[i]._rev = result.new_revs[i].rev;
}
return result;
Modified: incubator/couchdb/branches/runtimeconfig/share/www/script/couch_tests.js
URL: http://svn.apache.org/viewvc/incubator/couchdb/branches/runtimeconfig/share/www/script/couch_tests.js?rev=662262&r1=662261&r2=662262&view=diff
==============================================================================
--- incubator/couchdb/branches/runtimeconfig/share/www/script/couch_tests.js [utf-8] (original)
+++ incubator/couchdb/branches/runtimeconfig/share/www/script/couch_tests.js [utf-8] Sun Jun 1 11:27:31 2008
@@ -96,9 +96,9 @@
return sum(values);
};
- result = db.query(mapFunction, reduceFunction);
+ results = db.query(mapFunction, reduceFunction);
- T(result.result == 33);
+ T(results.rows[0].value == 33);
// delete a document
T(db.deleteDoc(existingDoc).ok);
@@ -242,21 +242,67 @@
var map = function (doc) {emit(doc.integer, doc.integer)};
var reduce = function (keys, values) { return sum(values); };
- var result = db.query(map, reduce).result;
- T(result == summate(numDocs));
+ var result = db.query(map, reduce);
+ T(result.rows[0].value == summate(numDocs));
- result = db.query(map, reduce, {startkey: 4, endkey: 4}).result;
- T(result == 4);
+ result = db.query(map, reduce, {startkey: 4, endkey: 4});
+ T(result.rows[0].value == 4);
- result = db.query(map, reduce, {startkey: 4, endkey: 5}).result;
- T(result == 9);
+ result = db.query(map, reduce, {startkey: 4, endkey: 5});
+ T(result.rows[0].value == 9);
- result = db.query(map, reduce, {startkey: 4, endkey: 6}).result;
- T(result == 15);
+ result = db.query(map, reduce, {startkey: 4, endkey: 6});
+ T(result.rows[0].value == 15);
for(var i=1; i<numDocs/2; i+=30) {
- result = db.query(map, reduce, {startkey: i, endkey: numDocs - i}).result;
- T(result == summate(numDocs-i) - summate(i-1));
+ result = db.query(map, reduce, {startkey: i, endkey: numDocs - i});
+ T(result.rows[0].value == summate(numDocs-i) - summate(i-1));
+ }
+
+ for(var i=1; i <= 5; i++) {
+
+ for(var j=0; j < 10; j++) {
+ // these docs are in the order of the keys collation, for clarity
+ var docs = [];
+ docs.push({keys:["a"]});
+ docs.push({keys:["a"]});
+ docs.push({keys:["a", "b"]});
+ docs.push({keys:["a", "b"]});
+ docs.push({keys:["a", "b", "c"]});
+ docs.push({keys:["a", "b", "d"]});
+ docs.push({keys:["a", "c", "d"]});
+ docs.push({keys:["d"]});
+ docs.push({keys:["d", "a"]});
+ docs.push({keys:["d", "b"]});
+ docs.push({keys:["d", "c"]});
+ T(db.bulkSave(docs).ok);
+ }
+
+ map = function (doc) {emit(doc.keys, 1)};
+ reduce = function (keys, values) { return sum(values); };
+
+ var results = db.query(map, reduce, {group:true});
+
+ //group by exact key match
+ T(equals(results.rows[0], {key:["a"],value:20*i}));
+ T(equals(results.rows[1], {key:["a","b"],value:20*i}));
+ T(equals(results.rows[2], {key:["a", "b", "c"],value:10*i}));
+ T(equals(results.rows[3], {key:["a", "b", "d"],value:10*i}));
+
+ //group by the first element in the key array
+ var results = db.query(map, reduce, {group_level:1});
+ T(equals(results.rows[0], {key:["a"],value:70*i}));
+ T(equals(results.rows[1], {key:["d"],value:40*i}));
+
+ //group by the first 2 elements in the key array
+ var results = db.query(map, reduce, {group_level:2});
+ T(equals(results.rows[0], {key:["a"],value:20*i}));
+ T(equals(results.rows[1], {key:["a","b"],value:40*i}));
+ T(equals(results.rows[2], {key:["a","c"],value:10*i}));
+ T(equals(results.rows[3], {key:["d"],value:10*i}));
+ T(equals(results.rows[4], {key:["d","a"],value:10*i}));
+ T(equals(results.rows[5], {key:["d","b"],value:10*i}));
+ T(equals(results.rows[6], {key:["d","c"],value:10*i}));
}
},
@@ -462,26 +508,26 @@
var summate = function(N) {return (N+1)*N/2;};
- var result = db.view("test/summate").result;
- T(result == summate(numDocs));
+ var result = db.view("test/summate");
+ T(result.rows[0].value == summate(numDocs));
- result = db.view("test/summate", {startkey:4,endkey:4}).result;
- T(result == 4);
+ result = db.view("test/summate", {startkey:4,endkey:4});
+ T(result.rows[0].value == 4);
- result = db.view("test/summate", {startkey:4,endkey:5}).result;
- T(result == 9);
+ result = db.view("test/summate", {startkey:4,endkey:5});
+ T(result.rows[0].value == 9);
- result = db.view("test/summate", {startkey:4,endkey:6}).result;
- T(result == 15);
+ result = db.view("test/summate", {startkey:4,endkey:6});
+ T(result.rows[0].value == 15);
// Verify that a shared index (view def is an exact copy of "summate")
// does not confuse the reduce stage
- result = db.view("test/summate2", {startkey:4,endkey:6}).result;
- T(result == 15);
+ result = db.view("test/summate2", {startkey:4,endkey:6});
+ T(result.rows[0].value == 15);
for(var i=1; i<numDocs/2; i+=30) {
- result = db.view("test/summate", {startkey:i,endkey:numDocs-i}).result;
- T(result == summate(numDocs-i) - summate(i-1));
+ result = db.view("test/summate", {startkey:i,endkey:numDocs-i});
+ T(result.rows[0].value == summate(numDocs-i) - summate(i-1));
}
T(db.deleteDoc(designDoc).ok);
Modified: incubator/couchdb/branches/runtimeconfig/src/couchdb/couch_btree.erl
URL: http://svn.apache.org/viewvc/incubator/couchdb/branches/runtimeconfig/src/couchdb/couch_btree.erl?rev=662262&r1=662261&r2=662262&view=diff
==============================================================================
--- incubator/couchdb/branches/runtimeconfig/src/couchdb/couch_btree.erl (original)
+++ incubator/couchdb/branches/runtimeconfig/src/couchdb/couch_btree.erl Sun Jun 1 11:27:31 2008
@@ -13,8 +13,8 @@
-module(couch_btree).
-export([open/2, open/3, query_modify/4, add/2, add_remove/3, foldl/3, foldl/4]).
--export([foldr/3, foldr/4, fold/4, fold/5, reduce/3, partial_reduce/3, final_reduce/2]).
--export([lookup/2, get_state/1, set_options/2, test/1, test/0]).
+-export([foldr/3, foldr/4, fold/4, fold/5, full_reduce/1, final_reduce/2]).
+-export([fold_reduce/7, lookup/2, get_state/1, set_options/2, test/1, test/0]).
-define(CHUNK_THRESHOLD, 16#fff).
@@ -68,25 +68,33 @@
final_reduce(Reduce, {KVs, Reductions}) ->
Red = Reduce(reduce, KVs),
final_reduce(Reduce, {[], [Red | Reductions]}).
+
+fold_reduce(Bt, StartKey, EndKey, KeyGroupFun, Fun, Acc) ->
+ fold_reduce(Bt, fwd, StartKey, EndKey, KeyGroupFun, Fun, Acc).
-reduce(Bt, Key1, Key2) ->
- {ok, Reds} = partial_reduce(Bt, Key1, Key2),
- {ok, final_reduce(Bt, Reds)}.
-
-partial_reduce(#btree{root=Root}=Bt, Key1, Key2) ->
- {KeyStart, KeyEnd} =
- case Key1 == nil orelse Key2 == nil orelse less(Bt, Key1, Key2) of
- true -> {Key1, Key2};
- false -> {Key2, Key1}
+fold_reduce(#btree{root=Root}=Bt, Dir, StartKey, EndKey, KeyGroupFun, Fun, Acc) ->
+ {StartKey2, EndKey2} =
+ case Dir of
+ rev -> {EndKey, StartKey};
+ fwd -> {StartKey, EndKey}
end,
- case Root of
- nil ->
- {ok, {[], []}};
- _ ->
- {KVs, Nodes} = collect_node(Bt, Root, KeyStart, KeyEnd),
- {ok, {KVs, [Red || {_K,{_P,Red}} <- Nodes]}}
+ {ok, Acc2, GroupedRedsAcc2, GroupedKVsAcc2, GroupedKey2} =
+ reduce_stream_node(Bt, Dir, Root, StartKey2, EndKey2, nil, [], [],
+ KeyGroupFun, Fun, Acc),
+ if GroupedKey2 == nil ->
+ {ok, Acc2};
+ true ->
+ case (catch Fun(GroupedKey2, {GroupedKVsAcc2, GroupedRedsAcc2}, Acc2)) of
+ {ok, Acc3} -> {ok, Acc3};
+ {stop, Acc3} -> {ok, Acc3};
+ Else -> throw(Else)
+ end
end.
-
+
+full_reduce(#btree{root=nil,reduce=Reduce}) ->
+ {ok, Reduce(reduce, [])};
+full_reduce(#btree{root={_P, Red}}) ->
+ {ok, Red}.
foldl(Bt, Fun, Acc) ->
fold(Bt, fwd, Fun, Acc).
@@ -390,17 +398,21 @@
end.
-collect_node(_Bt, {P, R}, nil, nil) ->
- {[], [{nil, {P,R}}]};
-collect_node(Bt, {P, R}, KeyStart, KeyEnd) ->
+reduce_stream_node(Bt, Dir, {P, _R}, KeyStart, KeyEnd, GroupedKey, GroupedKVsAcc,
+ GroupedRedsAcc, KeyGroupFun, Fun, Acc) ->
case get_node(Bt, P) of
{kp_node, NodeList} ->
- collect_kp_node(Bt, NodeList, KeyStart, KeyEnd);
+ reduce_stream_kp_node(Bt, Dir, NodeList, KeyStart, KeyEnd, GroupedKey,
+ GroupedKVsAcc, GroupedRedsAcc, KeyGroupFun, Fun, Acc);
{kv_node, KVs} ->
- collect_kv_node(Bt, {P,R}, KVs, KeyStart, KeyEnd)
+ reduce_stream_kv_node(Bt, Dir, KVs, KeyStart, KeyEnd, GroupedKey,
+ GroupedKVsAcc, GroupedRedsAcc, KeyGroupFun, Fun, Acc)
end.
-collect_kv_node(Bt, {P,R}, KVs, KeyStart, KeyEnd) ->
+reduce_stream_kv_node(Bt, Dir, KVs, KeyStart, KeyEnd,
+ GroupedKey, GroupedKVsAcc, GroupedRedsAcc,
+ KeyGroupFun, Fun, Acc) ->
+
GTEKeyStartKVs =
case KeyStart of
nil ->
@@ -413,20 +425,45 @@
nil ->
GTEKeyStartKVs;
_ ->
- lists:dropwhile(
- fun({Key,_}) ->
- less(Bt, KeyEnd, Key)
- end, lists:reverse(GTEKeyStartKVs))
- end,
- case length(KVs2) == length(KVs) of
- true -> % got full node, return the already calculated reduction
- {[], [{nil, {P, R}}]};
- false -> % otherwise return the keyvalues for later reduction
- {[assemble(Bt,K,V) || {K,V} <- KVs2], []}
+ lists:takewhile(
+ fun({Key,_}) ->
+ not less(Bt, KeyEnd, Key)
+ end, GTEKeyStartKVs)
+ end,
+ reduce_stream_kv_node2(Bt, adjust_dir(Dir, KVs2), GroupedKey, GroupedKVsAcc, GroupedRedsAcc,
+ KeyGroupFun, Fun, Acc).
+
+
+reduce_stream_kv_node2(_Bt, [], GroupedKey, GroupedKVsAcc, GroupedRedsAcc,
+ _KeyGroupFun, _Fun, Acc) ->
+ {ok, Acc, GroupedRedsAcc, GroupedKVsAcc, GroupedKey};
+reduce_stream_kv_node2(Bt, [{Key, Value}| RestKVs], GroupedKey, GroupedKVsAcc,
+ GroupedRedsAcc, KeyGroupFun, Fun, Acc) ->
+ case GroupedKey of
+ nil ->
+ reduce_stream_kv_node2(Bt, RestKVs, Key,
+ [assemble(Bt,Key,Value)], [], KeyGroupFun, Fun, Acc);
+ _ ->
+
+ case KeyGroupFun(GroupedKey, Key) of
+ true ->
+ reduce_stream_kv_node2(Bt, RestKVs, GroupedKey,
+ [assemble(Bt,Key,Value)|GroupedKVsAcc], GroupedRedsAcc, KeyGroupFun,
+ Fun, Acc);
+ false ->
+ case Fun(GroupedKey, {GroupedKVsAcc, GroupedRedsAcc}, Acc) of
+ {ok, Acc2} ->
+ reduce_stream_kv_node2(Bt, RestKVs, Key, [assemble(Bt,Key,Value)],
+ [], KeyGroupFun, Fun, Acc2);
+ {stop, Acc2} ->
+ throw({stop, Acc2})
+ end
+ end
end.
-
-
-collect_kp_node(Bt, NodeList, KeyStart, KeyEnd) ->
+
+reduce_stream_kp_node(Bt, Dir, NodeList, KeyStart, KeyEnd,
+ GroupedKey, GroupedKVsAcc, GroupedRedsAcc,
+ KeyGroupFun, Fun, Acc) ->
Nodes =
case KeyStart of
nil ->
@@ -437,48 +474,52 @@
less(Bt, Key, KeyStart)
end, NodeList)
end,
-
+ NodesInRange =
case KeyEnd of
nil ->
- case Nodes of
- [] ->
- {[], []};
- [{_, StartNodeInfo}|RestNodes] ->
- {DownKVs, DownNodes} = collect_node(Bt, StartNodeInfo, KeyStart, KeyEnd),
- {DownKVs, DownNodes ++ RestNodes}
- end;
+ Nodes;
_ ->
- {GTEKeyEndNodes, LTKeyEndNodes} = lists:splitwith(
+ {InRange, MaybeInRange} = lists:splitwith(
fun({Key,_}) ->
- not less(Bt, Key, KeyEnd)
- end, lists:reverse(Nodes)),
-
- {MatchingKVs, MatchingNodes} =
- case lists:reverse(LTKeyEndNodes) of
- [{_, StartNodeInfo}] ->
- collect_node(Bt, StartNodeInfo, KeyStart, KeyEnd);
- [{_, StartNodeInfo}|RestLTNodes] ->
- % optimization, since we have more KP nodes in range, we don't need
- % to provide the endkey when searching the start node, making
- % collecting the node faster.
- {DownKVs, DownNodes} = collect_node(Bt, StartNodeInfo, KeyStart, nil),
- {DownKVs, DownNodes ++ RestLTNodes};
- [] ->
- {[], []}
- end,
-
- case lists:reverse(GTEKeyEndNodes) of
- [{_, EndNodeInfo} | _] when LTKeyEndNodes == [] ->
- collect_node(Bt, EndNodeInfo, KeyStart, KeyEnd);
- [{_, EndNodeInfo} | _] ->
- {KVs1, DownNodes1} = collect_node(Bt, EndNodeInfo, nil, KeyEnd),
- {KVs1 ++ MatchingKVs, DownNodes1 ++ MatchingNodes};
- [] ->
- {MatchingKVs, MatchingNodes}
- end
- end.
+ less(Bt, Key, KeyEnd)
+ end, Nodes),
+ InRange ++ case MaybeInRange of [] -> []; [FirstMaybe|_] -> [FirstMaybe] end
+ end,
+ reduce_stream_kp_node2(Bt, Dir, adjust_dir(Dir, NodesInRange), KeyStart, KeyEnd,
+ GroupedKey, GroupedKVsAcc, GroupedRedsAcc, KeyGroupFun, Fun, Acc).
+reduce_stream_kp_node2(Bt, Dir, [{_Key, NodeInfo} | RestNodeList], KeyStart, KeyEnd,
+ nil, [], [], KeyGroupFun, Fun, Acc) ->
+ {ok, Acc2, GroupedRedsAcc2, GroupedKVsAcc2, GroupedKey2} =
+ reduce_stream_node(Bt, Dir, NodeInfo, KeyStart, KeyEnd, nil,
+ [], [], KeyGroupFun, Fun, Acc),
+ reduce_stream_kp_node2(Bt, Dir, RestNodeList, KeyStart, KeyEnd, GroupedKey2,
+ GroupedKVsAcc2, GroupedRedsAcc2, KeyGroupFun, Fun, Acc2);
+reduce_stream_kp_node2(Bt, Dir, NodeList, KeyStart, KeyEnd,
+ GroupedKey, GroupedKVsAcc, GroupedRedsAcc, KeyGroupFun, Fun, Acc) ->
+ {Grouped0, Ungrouped0} = lists:splitwith(fun({Key,_}) ->
+ KeyGroupFun(GroupedKey, Key) end, NodeList),
+ {GroupedNodes, UngroupedNodes} =
+ case Grouped0 of
+ [] ->
+ {Grouped0, Ungrouped0};
+ _ ->
+ [FirstGrouped | RestGrouped] = lists:reverse(Grouped0),
+ {RestGrouped, [FirstGrouped | Ungrouped0]}
+ end,
+ GroupedReds = [R || {_, {_,R}} <- GroupedNodes],
+ case UngroupedNodes of
+ [{_Key, NodeInfo}|RestNodes] ->
+ {ok, Acc2, GroupedRedsAcc2, GroupedKVsAcc2, GroupedKey2} =
+ reduce_stream_node(Bt, Dir, NodeInfo, KeyStart, KeyEnd, GroupedKey,
+ GroupedKVsAcc, GroupedReds ++ GroupedRedsAcc, KeyGroupFun, Fun, Acc),
+ reduce_stream_kp_node2(Bt, Dir, RestNodes, KeyStart, KeyEnd, GroupedKey2,
+ GroupedKVsAcc2, GroupedRedsAcc2, KeyGroupFun, Fun, Acc2);
+ [] ->
+ {ok, Acc, GroupedReds ++ GroupedRedsAcc, GroupedKVsAcc, GroupedKey}
+ end.
+
adjust_dir(fwd, List) ->
List;
adjust_dir(rev, List) ->
@@ -624,22 +665,10 @@
Len = length(KeyValues),
-
- {ok, Len} = reduce(Btree10, nil, nil),
-
- % Count of all from start to Val1
- Val1 = Len div 3,
- {ok, Val1} = reduce(Btree10, nil, Val1),
- % Count of all from Val1 to end
- CountVal1ToEnd = Len - Val1 + 1,
- {ok, CountVal1ToEnd} = reduce(Btree10, Val1, nil),
-
- % Count of all from Val1 to Val2
- Val2 = 2*Len div 3,
- CountValRange = Val2 - Val1 + 1,
- {ok, CountValRange} = reduce(Btree10, Val1, Val2),
% get the leading reduction as we foldl/r
+ % and count of all from start to Val1
+ Val1 = Len div 3,
{ok, true} = foldl(Btree10, Val1, fun(_X, LeadingReds, _Acc) ->
CountToStart = Val1 - 1,
CountToStart = final_reduce(Btree10, LeadingReds),
@@ -706,8 +735,44 @@
% verify the remaining
ok = test_keys(Btree80, A),
+
+ {ok, Btree90} = test_remove(Btree80, A),
+
+ EvenOdd = fun(V) when V rem 2 == 1 -> "odd"; (_) -> "even" end,
+
+ EvenOddKVs = [{{EvenOdd(Key),Key}, 1} || {Key, _} <- KeyValues],
+ {ok, Btree100} = test_add(Btree90, EvenOddKVs),
+ GroupingFun = fun({K1, _},{K2,_}) -> K1 == K2 end,
+ FoldFun = fun(GroupedKey, Unreduced, Acc) ->
+ {ok, [{GroupedKey, final_reduce(Btree100, Unreduced)} | Acc]}
+ end,
+
+ Half = Len div 2,
+
+ {ok, [{{"odd", _}, Half}, {{"even",_}, Half}]} =
+ fold_reduce(Btree100, nil, nil, GroupingFun, FoldFun, []),
+
+ {ok, [{{"even",_}, Half}, {{"odd", _}, Half}]} =
+ fold_reduce(Btree100, rev, nil, nil, GroupingFun, FoldFun, []),
+
+ {ok, [{{"even",_}, Half}]} =
+ fold_reduce(Btree100, fwd, {"even", -1}, {"even", foo}, GroupingFun, FoldFun, []),
+
+ {ok, [{{"even",_}, Half}]} =
+ fold_reduce(Btree100, rev, {"even", foo}, {"even", -1}, GroupingFun, FoldFun, []),
+
+ {ok, [{{"odd",_}, Half}]} =
+ fold_reduce(Btree100, fwd, {"odd", -1}, {"odd", foo}, GroupingFun, FoldFun, []),
+
+ {ok, [{{"odd",_}, Half}]} =
+ fold_reduce(Btree100, rev, {"odd", foo}, {"odd", -1}, GroupingFun, FoldFun, []),
+
+ {ok, [{{"odd", _}, Half}, {{"even",_}, Half}]} =
+ fold_reduce(Btree100, {"even", -1}, {"odd", foo}, GroupingFun, FoldFun, []),
+
ok = couch_file:close(Fd).
+
Modified: incubator/couchdb/branches/runtimeconfig/src/couchdb/couch_httpd.erl
URL: http://svn.apache.org/viewvc/incubator/couchdb/branches/runtimeconfig/src/couchdb/couch_httpd.erl?rev=662262&r1=662261&r2=662262&view=diff
==============================================================================
--- incubator/couchdb/branches/runtimeconfig/src/couchdb/couch_httpd.erl (original)
+++ incubator/couchdb/branches/runtimeconfig/src/couchdb/couch_httpd.erl Sun Jun 1 11:27:31 2008
@@ -34,7 +34,8 @@
direction = fwd,
start_docid = nil,
end_docid = <<>>,
- skip = 0
+ skip = 0,
+ group_level = 0
}).
start_link() ->
@@ -361,12 +362,10 @@
handle_db_request(Req, 'GET', {DbName, _Db, ["_view", DocId, ViewName]}) ->
#view_query_args{
start_key = StartKey,
- end_key = EndKey,
count = Count,
skip = SkipCount,
direction = Dir,
- start_docid = StartDocId,
- end_docid = EndDocId
+ start_docid = StartDocId
} = QueryArgs = parse_view_query(Req),
case couch_view:get_map_view({DbName, "_design/" ++ DocId, ViewName}) of
{ok, View} ->
@@ -380,8 +379,7 @@
{not_found, Reason} ->
case couch_view:get_reduce_view({DbName, "_design/" ++ DocId, ViewName}) of
{ok, View} ->
- {ok, Value} = couch_view:reduce(View, {StartKey, StartDocId}, {EndKey, EndDocId}),
- send_json(Req, {obj, [{ok,true}, {result, Value}]});
+ output_reduce_view(Req, View);
_ ->
throw({not_found, Reason})
end
@@ -410,12 +408,10 @@
handle_db_request(Req, 'POST', {DbName, _Db, ["_temp_view"]}) ->
#view_query_args{
start_key = StartKey,
- end_key = EndKey,
count = Count,
skip = SkipCount,
direction = Dir,
- start_docid = StartDocId,
- end_docid = EndDocId
+ start_docid = StartDocId
} = QueryArgs = parse_view_query(Req),
case Req:get_primary_header_value("content-type") of
@@ -440,8 +436,7 @@
RedSrc ->
{ok, View} = couch_view:get_reduce_view(
{temp, DbName, Language, MapSrc, RedSrc}),
- {ok, Value} = couch_view:reduce(View, {StartKey, StartDocId}, {EndKey, EndDocId}),
- send_json(Req, {obj, [{ok,true}, {result, Value}]})
+ output_reduce_view(Req, View)
end;
handle_db_request(_Req, _Method, {_DbName, _Db, ["_temp_view"]}) ->
@@ -459,6 +454,53 @@
handle_attachment_request(Req, Method, DbName, Db, UnquotedDocId,
UnquotedFileName).
+output_reduce_view(Req, View) ->
+ #view_query_args{
+ start_key = StartKey,
+ end_key = EndKey,
+ count = Count,
+ skip = Skip,
+ direction = Dir,
+ start_docid = StartDocId,
+ end_docid = EndDocId,
+ group_level = GroupLevel
+ } = parse_view_query(Req),
+ GroupRowsFun =
+ fun({_Key1,_}, {_Key2,_}) when GroupLevel == 0 ->
+ true;
+ ({Key1,_}, {Key2,_})
+ when is_integer(GroupLevel) and is_tuple(Key1) and is_tuple(Key2) ->
+ lists:sublist(tuple_to_list(Key1), GroupLevel) == lists:sublist(tuple_to_list(Key2), GroupLevel);
+ ({Key1,_}, {Key2,_}) ->
+ Key1 == Key2
+ end,
+ Resp = start_json_response(Req, 200),
+ Resp:write_chunk("{\"rows\":["),
+ {ok, _} = couch_view:fold_reduce(View, Dir, {StartKey, StartDocId}, {EndKey, EndDocId},
+ GroupRowsFun,
+ fun(_Key, _Red, {AccSeparator,AccSkip,AccCount}) when AccSkip > 0 ->
+ {ok, {AccSeparator,AccSkip-1,AccCount}};
+ (_Key, _Red, {AccSeparator,0,AccCount}) when AccCount == 0 ->
+ {stop,{AccSeparator,0,AccCount}};
+ (_Key, Red, {AccSeparator,0,AccCount}) when GroupLevel == 0 ->
+ Json = lists:flatten(cjson:encode({obj, [{key, null}, {value, Red}]})),
+ Resp:write_chunk(AccSeparator ++ Json),
+ {ok, {",",0,AccCount-1}};
+ (Key, Red, {AccSeparator,0,AccCount})
+ when is_tuple(Key) and is_integer(GroupLevel) ->
+ Json = lists:flatten(cjson:encode(
+ {obj, [{key, list_to_tuple(lists:sublist(tuple_to_list(Key), GroupLevel))},
+ {value, Red}]})),
+ Resp:write_chunk(AccSeparator ++ Json),
+ {ok, {",",0,AccCount-1}};
+ (Key, Red, {AccSeparator,0,AccCount}) ->
+ Json = lists:flatten(cjson:encode({obj, [{key, Key}, {value, Red}]})),
+ Resp:write_chunk(AccSeparator ++ Json),
+ {ok, {",",0,AccCount-1}}
+ end, {"", Skip, Count}),
+ Resp:write_chunk("]}"),
+ end_json_response(Resp).
+
handle_doc_request(Req, 'DELETE', _DbName, Db, DocId) ->
QueryRev = proplists:get_value("rev", Req:parse_qs()),
Etag = case Req:get_header_value("If-Match") of
@@ -731,6 +773,10 @@
"Bad URL query value, number expected: skip=~s", [Value])),
throw({query_parse_error, Msg})
end;
+ {"group", "true"} ->
+ Args#view_query_args{group_level=exact};
+ {"group_level", LevelStr} ->
+ Args#view_query_args{group_level=list_to_integer(LevelStr)};
_ -> % unknown key
Msg = lists:flatten(io_lib:format(
"Bad URL query key:~s", [Key])),
Modified: incubator/couchdb/branches/runtimeconfig/src/couchdb/couch_view.erl
URL: http://svn.apache.org/viewvc/incubator/couchdb/branches/runtimeconfig/src/couchdb/couch_view.erl?rev=662262&r1=662261&r2=662262&view=diff
==============================================================================
--- incubator/couchdb/branches/runtimeconfig/src/couchdb/couch_view.erl (original)
+++ incubator/couchdb/branches/runtimeconfig/src/couchdb/couch_view.erl Sun Jun 1 11:27:31 2008
@@ -17,7 +17,7 @@
-export([start_link/0,fold/4,fold/5,less_json/2, start_update_loop/3, start_temp_update_loop/5]).
-export([init/1,terminate/2,handle_call/3,handle_cast/2,handle_info/2,code_change/3]).
--export([get_reduce_view/1, get_map_view/1,get_row_count/1,reduce_to_count/1, reduce/3]).
+-export([get_reduce_view/1, get_map_view/1,get_row_count/1,reduce_to_count/1, fold_reduce/7]).
-include("couch_db.hrl").
@@ -80,8 +80,8 @@
end.
get_row_count(#view{btree=Bt}) ->
- {ok, Reds} = couch_btree:partial_reduce(Bt, nil, nil),
- {ok, reduce_to_count(Reds)}.
+ {ok, {Count, _Reds}} = couch_btree:full_reduce(Bt),
+ {ok, Count}.
get_reduce_view({temp, DbName, Type, MapSrc, RedSrc}) ->
{ok, #group{views=[View]}} = get_updated_group(get_temp_updater(DbName, Type, MapSrc, RedSrc)),
@@ -99,16 +99,20 @@
N -> {ok, {reduce, N, Lang, View}}
end.
-reduce({temp_reduce, #view{btree=Bt}}, Key1, Key2) ->
- {ok, {_Count, [Reduction]}} = couch_btree:reduce(Bt, Key1, Key2),
- {ok, Reduction};
+fold_reduce({temp_reduce, #view{btree=Bt}}, Dir, StartKey, EndKey, GroupFun, Fun, Acc) ->
-reduce({reduce, NthRed, Lang, #view{btree=Bt, reduce_funs=RedFuns}}, Key1, Key2) ->
- {ok, PartialReductions} = couch_btree:partial_reduce(Bt, Key1, Key2),
+ WrapperFun = fun({GroupedKey, _}, PartialReds, Acc0) ->
+ {_, [Red]} = couch_btree:final_reduce(Bt, PartialReds),
+ Fun(GroupedKey, Red, Acc0)
+ end,
+ couch_btree:fold_reduce(Bt, Dir, StartKey, EndKey, GroupFun,
+ WrapperFun, Acc);
+
+fold_reduce({reduce, NthRed, Lang, #view{btree=Bt, reduce_funs=RedFuns}}, Dir, StartKey, EndKey, GroupFun, Fun, Acc) ->
PreResultPadding = lists:duplicate(NthRed - 1, []),
PostResultPadding = lists:duplicate(length(RedFuns) - NthRed, []),
{_Name, FunSrc} = lists:nth(NthRed,RedFuns),
- ReduceFun =
+ ReduceFun =
fun(reduce, KVs) ->
{ok, Reduced} = couch_query_servers:reduce(Lang, [FunSrc], KVs),
{0, PreResultPadding ++ Reduced ++ PostResultPadding};
@@ -117,8 +121,12 @@
{ok, Reduced} = couch_query_servers:combine(Lang, [FunSrc], UserReds),
{0, PreResultPadding ++ Reduced ++ PostResultPadding}
end,
- {_, FinalReds} = couch_btree:final_reduce(ReduceFun, PartialReductions),
- {ok, lists:nth(NthRed, FinalReds)}.
+ WrapperFun = fun({GroupedKey, _}, PartialReds, Acc0) ->
+ {_, Reds} = couch_btree:final_reduce(ReduceFun, PartialReds),
+ Fun(GroupedKey, lists:nth(NthRed, Reds), Acc0)
+ end,
+ couch_btree:fold_reduce(Bt, Dir, StartKey, EndKey, GroupFun,
+ WrapperFun, Acc).
get_key_pos(_Key, [], _N) ->
0;
@@ -366,7 +374,7 @@
Group =
case couch_file:open(FileName) of
{ok, Fd} ->
- case couch_file:read_header(Fd, <<$r, $c, $k, 0>>) of
+ case (catch couch_file:read_header(Fd, <<$r, $c, $k, 0>>)) of
{ok, ExistingDiskGroup} ->
% validate all the view definitions in the index are correct.
case reset_group(ExistingDiskGroup) == reset_group(DbGroup) of