Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 58187200C47 for ; Thu, 30 Mar 2017 18:44:36 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 567F0160BA1; Thu, 30 Mar 2017 16:44:36 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 9BF76160B7E for ; Thu, 30 Mar 2017 18:44:35 +0200 (CEST) Received: (qmail 76308 invoked by uid 500); 30 Mar 2017 16:44:34 -0000 Mailing-List: contact commits-help@couchdb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@couchdb.apache.org Delivered-To: mailing list commits@couchdb.apache.org Received: (qmail 76297 invoked by uid 99); 30 Mar 2017 16:44:34 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 30 Mar 2017 16:44:34 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 9E1E5DFE34; Thu, 30 Mar 2017 16:44:34 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: davisp@apache.org To: commits@couchdb.apache.org Date: Thu, 30 Mar 2017 16:44:34 -0000 Message-Id: <3a1b3a1aef1a48259c819784b5323fbd@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/4] couch commit: updated refs/heads/feat-optimize-compaction-docid-phase to 14766b3 archived-at: Thu, 30 Mar 2017 16:44:36 -0000 Repository: couchdb-couch Updated Branches: refs/heads/feat-optimize-compaction-docid-phase [created] 14766b3f7 Redo mix Project: http://git-wip-us.apache.org/repos/asf/couchdb-couch/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb-couch/commit/bb201827 Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch/tree/bb201827 Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch/diff/bb201827 Branch: refs/heads/feat-optimize-compaction-docid-phase Commit: bb20182746a474f97f5f39c6ba027681d9f400b4 Parents: 1db1337 Author: Paul J. Davis Authored: Tue Mar 28 16:24:58 2017 -0500 Committer: Paul J. Davis Committed: Wed Mar 29 13:39:06 2017 -0500 ---------------------------------------------------------------------- src/couch_db_updater.erl | 45 +++++++++++++++++++++++-------------------- 1 file changed, 24 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/bb201827/src/couch_db_updater.erl ---------------------------------------------------------------------- diff --git a/src/couch_db_updater.erl b/src/couch_db_updater.erl index db5397e..1afad34 100644 --- a/src/couch_db_updater.erl +++ b/src/couch_db_updater.erl @@ -1416,31 +1416,16 @@ copy_meta_data(#db{fd=Fd, header=Header}=Db, DocCount) -> rem_seqs=[], infos=[] }, - Acc = merge_docids(Iter, Acc0), - {ok, IdTree} = couch_btree:add(Acc#merge_st.id_tree, Acc#merge_st.infos), - {ok, SeqTree} = couch_btree:add_remove( - Acc#merge_st.seq_tree, [], Acc#merge_st.rem_seqs - ), - update_compact_task(length(Acc#merge_st.infos)), + Acc1 = merge_docids(Iter, Acc0), + #merge_st{ + id_tree = IdTree, + seq_tree = SeqTree + } = flush_merge_st(Acc1), Db#db{id_tree=IdTree, seq_tree=SeqTree}. merge_docids(Iter, #merge_st{infos=Infos}=Acc) when length(Infos) > 1000 -> - #merge_st{ - id_tree=IdTree0, - seq_tree=SeqTree0, - rem_seqs=RemSeqs - } = Acc, - {ok, IdTree1} = couch_btree:add(IdTree0, Infos), - {ok, SeqTree1} = couch_btree:add_remove(SeqTree0, [], RemSeqs), - update_compact_task(length(Infos)), - Acc1 = Acc#merge_st{ - id_tree=IdTree1, - seq_tree=SeqTree1, - rem_seqs=[], - infos=[] - }, - merge_docids(Iter, Acc1); + merge_docids(Iter, flush_merge_st(Acc)); merge_docids(Iter, #merge_st{curr=Curr}=Acc) -> case next_info(Iter, Curr, []) of {NextIter, NewCurr, FDI, Seqs} -> @@ -1479,6 +1464,24 @@ next_info(Iter, {Id, Seq, FDI}, Seqs) -> end. +flush_merge_st(MergeSt) -> + #merge_st{ + id_tree=IdTree0, + seq_tree=SeqTree0, + infos=Infos, + rem_seqs=RemSeqs + } = MergeSt, + {ok, IdTree1} = couch_btree:add(IdTree0, Infos), + {ok, SeqTree1} = couch_btree:add_remove(SeqTree0, [], RemSeqs), + update_compact_task(length(Infos)), + MergeSt#merge_st{ + id_tree=IdTree1, + seq_tree=SeqTree1, + infos=[], + rem_seqs=[] + }. + + update_compact_task(NumChanges) -> [Changes, Total] = couch_task_status:get([changes_done, total_changes]), Changes2 = Changes + NumChanges,