1 Return-Path: <amdragon@mit.edu>
\r
2 X-Original-To: notmuch@notmuchmail.org
\r
3 Delivered-To: notmuch@notmuchmail.org
\r
4 Received: from localhost (localhost [127.0.0.1])
\r
5 by olra.theworths.org (Postfix) with ESMTP id A81AD431FB6
\r
6 for <notmuch@notmuchmail.org>; Sun, 30 Jan 2011 20:34:03 -0800 (PST)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=0 tagged_above=-999 required=5
\r
12 tests=[RCVD_IN_DNSWL_NONE=-0.0001] autolearn=disabled
\r
13 Received: from olra.theworths.org ([127.0.0.1])
\r
14 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
15 with ESMTP id W5P5rms446uJ for <notmuch@notmuchmail.org>;
\r
16 Sun, 30 Jan 2011 20:34:03 -0800 (PST)
\r
17 Received: from dmz-mailsec-scanner-5.mit.edu (DMZ-MAILSEC-SCANNER-5.MIT.EDU
\r
19 by olra.theworths.org (Postfix) with ESMTP id 25887431FB5
\r
20 for <notmuch@notmuchmail.org>; Sun, 30 Jan 2011 20:34:03 -0800 (PST)
\r
21 X-AuditID: 12074422-b7c3eae000000a70-de-4d463bbad04e
\r
22 Received: from mailhub-auth-4.mit.edu ( [18.7.62.39])
\r
23 by dmz-mailsec-scanner-5.mit.edu (Symantec Brightmail Gateway) with
\r
24 SMTP id 78.CC.02672.ABB364D4; Sun, 30 Jan 2011 23:34:02 -0500 (EST)
\r
25 Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])
\r
26 by mailhub-auth-4.mit.edu (8.13.8/8.9.2) with ESMTP id p0V4Y2XT015590
\r
27 for <notmuch@notmuchmail.org>; Sun, 30 Jan 2011 23:34:02 -0500
\r
28 Received: from awakening.csail.mit.edu (awakening.csail.mit.edu [18.26.4.91])
\r
29 (authenticated bits=0)
\r
30 (User authenticated as amdragon@ATHENA.MIT.EDU)
\r
31 by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id p0V4Y1ot008239
\r
32 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT)
\r
33 for <notmuch@notmuchmail.org>; Sun, 30 Jan 2011 23:34:02 -0500 (EST)
\r
34 Received: from amthrax by awakening.csail.mit.edu with local (Exim 4.72)
\r
35 (envelope-from <amdragon@mit.edu>) id 1PjlSU-00070D-AY
\r
36 for notmuch@notmuchmail.org; Sun, 30 Jan 2011 23:33:46 -0500
\r
37 Date: Sun, 30 Jan 2011 23:33:41 -0500
\r
38 From: Austin Clements <amdragon@MIT.EDU>
\r
39 To: notmuch@notmuchmail.org
\r
40 Subject: [PATCH 9/8] qparser: Delete (and thus close) the Xapian database.
\r
41 Message-ID: <20110131043341.GB13226@mit.edu>
\r
42 References: <1295165458-9573-1-git-send-email-amdragon@mit.edu>
\r
44 Content-Type: text/plain; charset=us-ascii
\r
45 Content-Disposition: inline
\r
46 In-Reply-To: <1295165458-9573-1-git-send-email-amdragon@mit.edu>
\r
47 User-Agent: Mutt/1.5.20 (2009-06-14)
\r
48 X-Brightmail-Tracker: AAAAAA==
\r
49 X-BeenThere: notmuch@notmuchmail.org
\r
50 X-Mailman-Version: 2.1.13
\r
52 List-Id: "Use and development of the notmuch mail system."
\r
53 <notmuch.notmuchmail.org>
\r
54 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
55 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
56 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
57 List-Post: <mailto:notmuch@notmuchmail.org>
\r
58 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
59 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
60 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
61 X-List-Received-Date: Mon, 31 Jan 2011 04:34:03 -0000
\r
63 I removed this line in a bout of overzealous deletions. The visible
\r
64 consequence was that the database was being unlocked lazily, resulting
\r
65 in a brief window after notmuch had exited but the database was still
\r
68 I admit this patch series numbering is getting a little out of hand.
\r
69 As usual, this can be found on the qparser branch at
\r
70 http://awakening.csail.mit.edu/git/notmuch.git
\r
72 lib/database.cc | 1 +
\r
73 1 files changed, 1 insertions(+), 0 deletions(-)
\r
75 diff --git a/lib/database.cc b/lib/database.cc
\r
76 index 7253bdf..3c488a9 100644
\r
77 --- a/lib/database.cc
\r
78 +++ b/lib/database.cc
\r
79 @@ -826,6 +826,7 @@ notmuch_database_close (notmuch_database_t *notmuch)
\r
82 delete notmuch->term_gen;
\r
83 + delete notmuch->xapian_db;
\r
84 talloc_free (notmuch);
\r