MIME-Version: 1.0
Sender: amdragon@gmail.com
In-Reply-To: <1315590950.2435.59.camel@delen>
References: <1315445674.32058.183.camel@delen>
	<CAH-f9WtuYYuksfTHL1ZMmoRF6kyL7iFu9BXDzGn-wWGniSvf9w@mail.gmail.com>
	<1315536861.2435.34.camel@delen> <87obyuj7q1.fsf@zancas.localnet>
	<1315590950.2435.59.camel@delen>
Date: Fri, 9 Sep 2011 19:40:10 -0400
Message-ID:
 <CAH-f9WtuL48RtaJ9njxHyCy5cqhhrxdz+30ydE11rq41Lu06pA@mail.gmail.com>
Subject: Re: Patch: Flush and Reopen
From: Austin Clements <amdragon@mit.edu>
To: Martin Owens <doctormo@gmail.com>
Content-Type: text/plain; charset=ISO-8859-1
Cc: Notmuch developer list <notmuch@notmuchmail.org>
Precedence: list

On Fri, Sep 9, 2011 at 1:55 PM, Martin Owens <doctormo@gmail.com> wrote:
> That probably was unintended. See attached for the all new slimmed down
> patch.


--- a/lib/database.cc
+++ b/lib/database.cc
@@ -700,18 +700,37 @@ notmuch_database_open (const char *path,
 }

 void
-notmuch_database_close (notmuch_database_t *notmuch)
+notmuch_database_reopen (notmuch_database_t *notmuch)
 {
     try {
-	if (notmuch->mode == NOTMUCH_DATABASE_MODE_READ_WRITE)
-	    (static_cast <Xapian::WritableDatabase *> (notmuch->xapian_db))->flush ();
+        if (notmuch->mode == NOTMUCH_DATABASE_MODE_READ_ONLY)
+            (static_cast <Xapian::Database *> (notmuch->xapian_db))->reopen();

I was thinking this should probably just be

try {
  notmuch->xapian_db->reopen ();
} catch ...

(indented correctly, of course).  Reopen is a method of
Xapian::Database, which is what notmuch->xapian_db is anyway (unlike,
flush, which is a member of the subclass WritableDatabase and hence
requires the cast).  And reopening is a sensible thing to do on both
read-only and read/write databases.

Also, in keeping with notmuch code style, you should use tabs for
indentation and put a space before the open paren argument lists.