Return-Path: X-Original-To: apmail-couchdb-commits-archive@www.apache.org Delivered-To: apmail-couchdb-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id DF3CF9B8D for ; Wed, 28 Mar 2012 19:34:33 +0000 (UTC) Received: (qmail 65304 invoked by uid 500); 28 Mar 2012 19:34:33 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 65263 invoked by uid 500); 28 Mar 2012 19:34:33 -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 65255 invoked by uid 99); 28 Mar 2012 19:34:33 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 28 Mar 2012 19:34:33 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 5D1C39BE9; Wed, 28 Mar 2012 19:34:33 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jan@apache.org To: commits@couchdb.apache.org X-Mailer: ASF-Git Admin Mailer Subject: git commit: Remove assertion when database compaction finishes Message-Id: <20120328193433.5D1C39BE9@tyr.zones.apache.org> Date: Wed, 28 Mar 2012 19:34:33 +0000 (UTC) Updated Branches: refs/heads/1.2.x 9d441c544 -> e736fa9e3 Remove assertion when database compaction finishes Because the task status is updated only if the time elapsed since the last task status update is greater than some treshold, the value of the changes_done property might be smaller than TotalChanges. Closes COUCHDB-1451 Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/e736fa9e Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/e736fa9e Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/e736fa9e Branch: refs/heads/1.2.x Commit: e736fa9e314034e2603ac5861692ddeab92f1dad Parents: 9d441c5 Author: Filipe David Borba Manana Authored: Wed Mar 28 16:34:13 2012 +0100 Committer: Jan Lehnardt Committed: Wed Mar 28 21:34:12 2012 +0200 ---------------------------------------------------------------------- src/couchdb/couch_db_updater.erl | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb/blob/e736fa9e/src/couchdb/couch_db_updater.erl ---------------------------------------------------------------------- diff --git a/src/couchdb/couch_db_updater.erl b/src/couchdb/couch_db_updater.erl index eaf1bd3..88eb4a0 100644 --- a/src/couchdb/couch_db_updater.erl +++ b/src/couchdb/couch_db_updater.erl @@ -952,7 +952,6 @@ copy_compact(Db, NewDb0, Retry) -> [{start_key, NewDb#db.update_seq + 1}]), NewDb3 = copy_docs(Db, NewDb2, lists:reverse(Uncopied), Retry), - TotalChanges = couch_task_status:get(changes_done), % copy misc header values if NewDb3#db.security /= Db#db.security ->