diff options
| author | Adam Kocoloski <kocolosk@apache.org> | 2009-11-21 13:43:43 +0000 |
|---|---|---|
| committer | Adam Kocoloski <kocolosk@apache.org> | 2009-11-21 13:43:43 +0000 |
| commit | aef9dbd3a6cbb85085023d3c8565740e09fd6a77 (patch) | |
| tree | 7ee342a14f36f7a21b2249b832c9700f082d55b6 /src/couchdb/couch_db_updater.erl | |
| parent | 9c97bb531ed9b5d6fc18fcef87a6742514e984d5 (diff) | |
code improvements from tidier. Patch by Kostis Sagonas. COUCHDB-570
git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@882903 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/couchdb/couch_db_updater.erl')
| -rw-r--r-- | src/couchdb/couch_db_updater.erl | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/couchdb/couch_db_updater.erl b/src/couchdb/couch_db_updater.erl index 31366a84..d9951cf6 100644 --- a/src/couchdb/couch_db_updater.erl +++ b/src/couchdb/couch_db_updater.erl @@ -318,11 +318,12 @@ btree_by_seq_reduce(reduce, DocInfos) -> btree_by_seq_reduce(rereduce, Reds) -> lists:sum(Reds). -simple_upgrade_record(Old, New) when size(Old) == size(New)-> +simple_upgrade_record(Old, New) when tuple_size(Old) =:= tuple_size(New) -> Old; simple_upgrade_record(Old, New) -> + OldSz = tuple_size(Old), NewValuesTail = - lists:sublist(tuple_to_list(New), size(Old) + 1, size(New)-size(Old)), + lists:sublist(tuple_to_list(New), OldSz + 1, tuple_size(New) - OldSz), list_to_tuple(tuple_to_list(Old) ++ NewValuesTail). @@ -751,9 +752,9 @@ copy_compact(Db, NewDb0, Retry) -> fun(#doc_info{high_seq=Seq}=DocInfo, _Offset, {AccNewDb, AccUncopied, TotalCopied}) -> couch_task_status:update("Copied ~p of ~p changes (~p%)", [TotalCopied, TotalChanges, (TotalCopied*100) div TotalChanges]), - if TotalCopied rem 1000 == 0 -> + if TotalCopied rem 1000 =:= 0 -> NewDb2 = copy_docs(Db, AccNewDb, lists:reverse([DocInfo | AccUncopied]), Retry), - if TotalCopied rem 10000 == 0 -> + if TotalCopied rem 10000 =:= 0 -> {ok, {commit_data(NewDb2#db{update_seq=Seq}), [], TotalCopied + 1}}; true -> {ok, {NewDb2#db{update_seq=Seq}, [], TotalCopied + 1}} |