From 4d99f60a9fcc93e45eb5670c0dd8cc0b71820f77 Mon Sep 17 00:00:00 2001 From: Adam Kocoloski Date: Thu, 16 Jul 2009 20:40:59 +0000 Subject: checkpoint long-running view updates Improves stale=ok view queries, which will now see gradually updating indexes. Also reduces the consequences of an updater crash because we can restart from the latest checkpoint. git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@794843 13f79535-47bb-0310-9956-ffa450edef68 --- src/couchdb/couch_view_updater.erl | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) (limited to 'src/couchdb/couch_view_updater.erl') diff --git a/src/couchdb/couch_view_updater.erl b/src/couchdb/couch_view_updater.erl index cfdc7ca8..64c86185 100644 --- a/src/couchdb/couch_view_updater.erl +++ b/src/couchdb/couch_view_updater.erl @@ -12,11 +12,17 @@ -module(couch_view_updater). --export([update/1]). +-export([update/2]). -include("couch_db.hrl"). -update(#group{db=#db{name=DbName}=Db,name=GroupName,current_seq=Seq,purge_seq=PurgeSeq}=Group) -> +update(Owner, Group) -> + #group{ + db = #db{name=DbName} = Db, + name = GroupName, + current_seq = Seq, + purge_seq = PurgeSeq + } = Group, couch_task_status:add_task(<<"View Group Indexer">>, <>, <<"Starting index update">>), DbPurgeSeq = couch_db:get_purge_seq(Db), @@ -43,7 +49,7 @@ update(#group{db=#db{name=DbName}=Db,name=GroupName,current_seq=Seq,purge_seq=Pu fun(DocInfo, _, {ChangesProcessed, Acc}) -> couch_task_status:update("Processed ~p of ~p changes (~p%)", [ChangesProcessed, TotalChanges, (ChangesProcessed*100) div TotalChanges]), - {ok, {ChangesProcessed+1, process_doc(Db, DocInfo, Acc)}} + {ok, {ChangesProcessed+1, process_doc(Db, Owner, DocInfo, Acc)}} end, {0, {[], Group2, ViewEmptyKVs, []}} ), @@ -90,9 +96,9 @@ purge_index(#group{db=Db, views=Views, id_btree=IdBtree}=Group) -> views=Views2, purge_seq=couch_db:get_purge_seq(Db)}. -process_doc(Db, DocInfo, {Docs, #group{sig=Sig,name=GroupId,design_options=DesignOptions}=Group, ViewKVs, - DocIdViewIdKeys}) -> - % This fun computes once for each document +% This fun computes once for each document +process_doc(Db, Owner, DocInfo, {Docs, Group, ViewKVs, DocIdViewIdKeys}) -> + #group{ design_options = DesignOptions } = Group, #doc_info{id=DocId, revs=[#rev_info{deleted=Deleted}|_]} = DocInfo, IncludeDesign = proplists:get_value(<<"include_design">>, @@ -125,6 +131,9 @@ process_doc(Db, DocInfo, {Docs, #group{sig=Sig,name=GroupId,design_options=Desig Results, ViewKVs, DocIdViewIdKeys2), {ok, Group2} = write_changes(Group1, ViewKVs3, DocIdViewIdKeys3, DocInfo#doc_info.high_seq), + if is_pid(Owner) -> + ok = gen_server:cast(Owner, {partial_update, Group2}); + true -> ok end, garbage_collect(), ViewEmptyKeyValues = [{View, []} || View <- Group2#group.views], {[], Group2, ViewEmptyKeyValues, []}; -- cgit v1.2.3