From 2bdd685dc2c426fc74f5d2c89d8e34653a1c55aa Mon Sep 17 00:00:00 2001 From: Adam Kocoloski Date: Mon, 14 Jun 2010 18:57:09 -0400 Subject: update all_docs and map rpc endpoints for 0.11 btree --- src/fabric_rpc.erl | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/fabric_rpc.erl b/src/fabric_rpc.erl index da4a9b8c..d0558697 100644 --- a/src/fabric_rpc.erl +++ b/src/fabric_rpc.erl @@ -40,7 +40,7 @@ all_docs(DbName, #view_query_args{keys=nil} = QueryArgs) -> stop_fun = all_docs_stop_fun(QueryArgs) }, Options = [{start_key, StartId}, {dir, Dir}], - {ok, Acc} = couch_db:enum_docs(Db, fun view_fold/3, Acc0, Options), + {ok, _, Acc} = couch_db:enum_docs(Db, fun view_fold/3, Acc0, Options), final_response(Total, Acc#view_acc.offset). changes(DbName, Args0, StartSeq) -> @@ -95,14 +95,16 @@ map_view(DbName, DDoc, ViewName, QueryArgs) -> }, case Keys of nil -> - {ok, Acc} = couch_view:fold(View, Start, Dir, fun view_fold/3, Acc0); + Options = [{start_key, Start}, {dir, Dir}], + {ok, _, Acc} = couch_view:fold(View, fun view_fold/3, Acc0, Options); _ -> Acc = lists:foldl(fun(Key, AccIn) -> KeyStart = {Key, StartDocId}, KeyStop = default_stop_fun(QueryArgs#view_query_args{start_key=Key, end_key=Key}), - {_Go, Out} = couch_view:fold(View, KeyStart, Dir, fun view_fold/3, - AccIn#view_acc{stop_fun = KeyStop}), + Options = [{start_key, KeyStart}, {dir, Dir}], + {_Go, _, Out} = couch_view:fold(View, fun view_fold/3, + AccIn#view_acc{stop_fun = KeyStop}, Options), Out end, Acc0, Keys) end, -- cgit v1.2.3