From 0485ae7447e5f9c0f3f6af74ae479a2d9fd45c41 Mon Sep 17 00:00:00 2001 From: Jani Nikula Date: Sun, 3 Nov 2013 14:24:40 +0200 Subject: [PATCH] [PATCH v2 00/11] compactor changes v2 --- 4a/f5ed7e1ef21bfdb71264a78764e5415c5e142a | 100 ++++++++++++++++++++++ 1 file changed, 100 insertions(+) create mode 100644 4a/f5ed7e1ef21bfdb71264a78764e5415c5e142a diff --git a/4a/f5ed7e1ef21bfdb71264a78764e5415c5e142a b/4a/f5ed7e1ef21bfdb71264a78764e5415c5e142a new file mode 100644 index 000000000..9105b577e --- /dev/null +++ b/4a/f5ed7e1ef21bfdb71264a78764e5415c5e142a @@ -0,0 +1,100 @@ +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 19203431FDB + for ; Sun, 3 Nov 2013 04:25:07 -0800 (PST) +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 y7AHbm1m-zy4 for ; + Sun, 3 Nov 2013 04:24:57 -0800 (PST) +Received: from mail-ee0-f45.google.com (mail-ee0-f45.google.com + [74.125.83.45]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client + certificate requested) by olra.theworths.org (Postfix) with ESMTPS id + CE5E2431FAF for ; Sun, 3 Nov 2013 04:24:56 -0800 + (PST) +Received: by mail-ee0-f45.google.com with SMTP id e50so584512eek.18 + for ; Sun, 03 Nov 2013 04:24:55 -0800 (PST) +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=HEg6UewcKFHDdA8sTEbIDv2k/f4WU/6epNSZBZA6GIo=; + b=UFWTali1Tnw2KIeDLAa24SmsEzCEz4IgBlEbCyRQ0Kfx6xH/EB3eidmZfDQImq+1uB + wNrNKDt5g3lQUr74U+n8806XmxVOYmv8gtxODorbsFijYMfH3zlju++CdspczuU2sg0k + gGZ23jq6RjhaHvleausLfKMNuJ05EgxiOZOBgh19GKr5wFbyHji/Csoz5tPNLIkzN9BC + bWMssYNxb1m9BsY+Ir+PiPVJBRaPJCLiePcfase+Lcyhw+usTkTupPsKGrHK8L4m6OZX + qo5s59bovdu1KR/a53JixFHg4aD6lOdI90t/FVVii6tCLz2v4VBZE5zoh93r9oURf9Tg + ptqg== +X-Gm-Message-State: + ALoCoQmyQerohIjL2SHG7puIePWIP6fP142T3lT+YzMclSDw8c2tSSsvOCi/mwCghzIrj21NTT3F +X-Received: by 10.14.108.9 with SMTP id p9mr12700625eeg.8.1383481494039; + Sun, 03 Nov 2013 04:24:54 -0800 (PST) +Received: from localhost (dsl-hkibrasgw2-58c36f-91.dhcp.inet.fi. + [88.195.111.91]) + by mx.google.com with ESMTPSA id d7sm32824419eem.8.2013.11.03.04.24.52 + for + (version=TLSv1.2 cipher=RC4-SHA bits=128/128); + Sun, 03 Nov 2013 04:24:53 -0800 (PST) +From: Jani Nikula +To: notmuch@notmuchmail.org +Subject: [PATCH v2 00/11] compactor changes v2 +Date: Sun, 3 Nov 2013 14:24:40 +0200 +Message-Id: +X-Mailer: git-send-email 1.8.4.rc3 +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: Sun, 03 Nov 2013 12:25:07 -0000 + +Hi all, this is v2 of [1], incorporating compact related patches from +David, some changes from David's review, some new patches, man page +update, test update. + +Cheers, +Jani. + + +[1] id:cover.1383315568.git.jani@nikula.org + + +David Bremner (2): + test: fix compact backup / restore test + lib: update documentation of callback functions for database_compact + and database_upgrade. + +Jani Nikula (9): + lib: construct compactor within try block to catch any exceptions + lib: check talloc success in compact + lib: do not leak the database in compaction + lib: add closure parameter to compact status update callback + lib: use the compaction backup path provided by the caller + cli: return error status if compaction fails + cli: add compact --backup=DIRECTORY option, don't backup by default + cli: add compact --verbose option and silence output without it + man: document notmuch compact --verbose and --backup=DIRECTORY options + + lib/database.cc | 41 +++++++++++++++++++++++------------------ + lib/notmuch.h | 11 ++++++++--- + man/man1/notmuch-compact.1 | 28 +++++++++++++++++++++++++++- + notmuch-compact.c | 46 +++++++++++++++++++++++++++------------------- + test/compact | 9 +++++---- + 5 files changed, 90 insertions(+), 45 deletions(-) + +-- +1.8.4.rc3 + -- 2.26.2