From 478e957f17813676ec2d1b57cde249c06d00d1e5 Mon Sep 17 00:00:00 2001 From: Robert Newson Date: Wed, 5 Sep 2012 00:15:36 +0100 Subject: Add total_changes to view compaction status Conflicts: apps/couch/src/couch_view_compactor.erl --- apps/couch/src/couch_view_compactor.erl | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/apps/couch/src/couch_view_compactor.erl b/apps/couch/src/couch_view_compactor.erl index ccb3fe3a..65475d8a 100644 --- a/apps/couch/src/couch_view_compactor.erl +++ b/apps/couch/src/couch_view_compactor.erl @@ -62,7 +62,9 @@ compact_group(Group, EmptyGroup, DbName) -> exit({view_duplicated_id, DocId}); true -> ok end, if TotalCopied rem 10000 =:= 0 -> - couch_task_status:update([{changes_done, TotalCopied}, {progress, (TotalCopied * 100) div Count}]), + couch_task_status:update([{changes_done, TotalCopied}, + {total_changes, Count}, + {progress, (TotalCopied * 100) div Count}]), {ok, Bt2} = couch_btree:add(Bt, lists:reverse([KV|Acc])), {ok, {Bt2, [], TotalCopied+1, DocId}}; true -> @@ -110,7 +112,9 @@ compact_view(View, EmptyView) -> %% Key is {Key,DocId} Fun = fun(KV, {Bt, Acc, TotalCopied}) -> if TotalCopied rem 10000 =:= 0 -> - couch_task_status:update([{changes_done, TotalCopied}, {progress, (TotalCopied * 100) div Count}]), + couch_task_status:update([{changes_done, TotalCopied}, + {total_changes, Count}, + {progress, (TotalCopied * 100) div Count}]), {ok, Bt2} = couch_btree:add(Bt, lists:reverse([KV|Acc])), {ok, {Bt2, [], TotalCopied + 1}}; true -> -- cgit v1.2.3