From: Jani Nikula Date: Fri, 1 Nov 2013 14:27:09 +0000 (+0100) Subject: [PATCH 0/6] compactor changes X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=43921457391d38b4e4c30a585310f056517634b3;p=notmuch-archives.git [PATCH 0/6] compactor changes --- diff --git a/03/b66a35988207ce026eff9d2644188eab7f6235 b/03/b66a35988207ce026eff9d2644188eab7f6235 new file mode 100644 index 000000000..ce99670d0 --- /dev/null +++ b/03/b66a35988207ce026eff9d2644188eab7f6235 @@ -0,0 +1,89 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id 0D257431FBC + for ; Fri, 1 Nov 2013 07:27:36 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: -0.7 +X-Spam-Level: +X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5 + tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id laMTwDZ7RIor for ; + Fri, 1 Nov 2013 07:27:31 -0700 (PDT) +Received: from mail-ea0-f173.google.com (mail-ea0-f173.google.com + [209.85.215.173]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id ABDF7431FAE + for ; Fri, 1 Nov 2013 07:27:31 -0700 (PDT) +Received: by mail-ea0-f173.google.com with SMTP id g10so2093692eak.32 + for ; Fri, 01 Nov 2013 07:27:30 -0700 (PDT) +X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; + d=1e100.net; s=20130820; + h=x-gm-message-state:from:to:cc:subject:date:message-id; + bh=LB8V6juHVnS4Pqsv8ytkxa8lYIB9GoBySQIMqlGDZ0I=; + b=dVyfYtxpi8X5lMpkurJDpbv2f5tszWzptxYNJcmhh6OEvvMJErBfzM2k8/IAcyc1Fw + wPZ2xjUPS3IMYugb4MLbYcpqgH0p3zgBQWkyQQTbxpP5CJr4I1C61hxst5Le3/0vHFU/ + w89mZjb9+7dZzZTN3hjapeW2TH4THH++T4OqFj7KUZClOiL7ky80kmr0pUCdsz1fU5d5 + RqU3LVMtaV11SwdiL0pM3wKG9luaXnXUcBJDcOWN9OHvmqAZf6wYzl3Ss21+rF4x1CfB + jmaymmI4wmYIz4/p/3x9w6Uq9AS9YxVbEzgJpNFz3U7+MeeeYi3BZ83EROMkbUA4oBE9 + 7frg== +X-Gm-Message-State: + ALoCoQnLL7u7u6RhrJg+gbfvcwmrluDzJlA9JoiX29/jce28p+T7g3OZ02Bt5i8Mz+btJY6X/DiP +X-Received: by 10.15.44.8 with SMTP id y8mr3533337eev.38.1383316050296; + Fri, 01 Nov 2013 07:27:30 -0700 (PDT) +Received: from localhost ([2001:4b98:dc0:43:216:3eff:fe1b:25f3]) + by mx.google.com with ESMTPSA id e13sm8393770eeu.4.2013.11.01.07.27.28 + for + (version=TLSv1.1 cipher=RC4-SHA bits=128/128); + Fri, 01 Nov 2013 07:27:29 -0700 (PDT) +From: Jani Nikula +To: notmuch@notmuchmail.org +Subject: [PATCH 0/6] compactor changes +Date: Fri, 1 Nov 2013 15:27:09 +0100 +Message-Id: +X-Mailer: git-send-email 1.7.2.5 +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Fri, 01 Nov 2013 14:27:36 -0000 + +David was a bit hasty with pushing compact, so I missed the +review. Instead of just whining about it, here's a few changes I'd +really like to see merged before release. Completely untested, needs man +page updates and probably test changes too, so there's a bit more to do +still. Hint, if you have the time, just pick up from here. ;) + +Cheers, +Jani. + + +Jani Nikula (6): + lib: construct compactor within try block to catch any exceptions + lib: add closure parameter to compact status update callback + lib: use the backup path provided by the user, don't add anything to + it + cli: return error status if compaction fails + cli: add compact --backup=FILE option, don't backup by default + cli: add compact --verbose option and silence output without it + + lib/database.cc | 29 ++++++++++++++--------------- + lib/notmuch.h | 5 +++-- + notmuch-compact.c | 46 +++++++++++++++++++++++++++------------------- + 3 files changed, 44 insertions(+), 36 deletions(-) + +-- +1.7.2.5 +