Re: [PATCH v3] lib: Simplify close and codify aborting atomic section

diff --git a/14/6d8370673b94a33b5fe09229672c2eadb7c717 b/14/6d8370673b94a33b5fe09229672c2eadb7c717
new file mode 100644 (file)
index 0000000..6bfccc2
--- /dev/null
+++ b/14/6d8370673b94a33b5fe09229672c2eadb7c717
@@ -0,0 +1,137 @@
+Return-Path: <wking@tremily.us>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id 141C6431FC0\r
+       for <notmuch@notmuchmail.org>; Wed, 24 Sep 2014 14:39:21 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.1\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.1 tagged_above=-999 required=5\r
+       tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
+       RCVD_IN_DNSWL_NONE=-0.0001] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id WGCKgjYx6aXG for <notmuch@notmuchmail.org>;\r
+       Wed, 24 Sep 2014 14:39:13 -0700 (PDT)\r
+Received: from resqmta-po-01v.sys.comcast.net (resqmta-po-01v.sys.comcast.net\r
+       [96.114.154.160])\r
+       (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 58914431FBD\r
+       for <notmuch@notmuchmail.org>; Wed, 24 Sep 2014 14:39:13 -0700 (PDT)\r
+Received: from resomta-po-08v.sys.comcast.net ([96.114.154.232])\r
+       by resqmta-po-01v.sys.comcast.net with comcast\r
+       id v9cq1o00F516pyw019fCrL; Wed, 24 Sep 2014 21:39:12 +0000\r
+Received: from odin.tremily.us ([24.18.63.50])\r
+       by resomta-po-08v.sys.comcast.net with comcast\r
+       id v9fB1o00F152l3L019fBrW; Wed, 24 Sep 2014 21:39:12 +0000\r
+Received: by odin.tremily.us (Postfix, from userid 1000)\r
+       id 2363413BF318; Wed, 24 Sep 2014 14:39:11 -0700 (PDT)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tremily.us; s=odin;\r
+       t=1411594751; bh=29xaQ83nIobJVVFWBjPYb704ixo/48owUqP7Ai1sSY8=;\r
+       h=Date:From:To:Cc:Subject:References:In-Reply-To;\r
+       b=LUe/f5wXQm6FJuVyo/Lz857N1XKqRYSwagcpgxRuOnPYCqIhNhulyYpUq0Uq8lyMl\r
+       td9udCIy3Qs5oIkQmycYUZpseHZhQezs0dzPTpk5n09Sh0j1dPxCH9Ow9U2jUgqIHl\r
+       Sg24mfkMuTyJBABK39wPLiJ+0/LL7c7SvpXgPneU=\r
+Date: Wed, 24 Sep 2014 14:39:10 -0700\r
+From: "W. Trevor King" <wking@tremily.us>\r
+To: Austin Clements <aclements@csail.mit.edu>\r
+Subject: Re: [PATCH v3] lib: Simplify close and codify aborting atomic section\r
+Message-ID: <20140924213910.GF20130@odin.tremily.us>\r
+References: <20140924212839.GE20130@odin.tremily.us>\r
+       <1411594370-9794-1-git-send-email-aclements@csail.mit.edu>\r
+MIME-Version: 1.0\r
+Content-Type: multipart/signed; micalg=pgp-sha1;\r
+       protocol="application/pgp-signature"; boundary="/aVve/J9H4Wl5yVO"\r
+Content-Disposition: inline\r
+In-Reply-To: <1411594370-9794-1-git-send-email-aclements@csail.mit.edu>\r
+OpenPGP: id=39A2F3FA2AB17E5D8764F388FC29BDCDF15F5BE8;\r
+       url=http://tremily.us/pubkey.txt\r
+User-Agent: Mutt/1.5.23 (2014-03-12)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=comcast.net;\r
+       s=q20140121; t=1411594752;\r
+       bh=eYRnpNHm1iV1mw9zTioOAa0EC+gQm3Hz9kEszYhumnM=;\r
+       h=Received:Received:Received:Date:From:To:Subject:Message-ID:\r
+       MIME-Version:Content-Type;\r
+       b=IVy8EBUrxx/MDo+kR3COBt/AUXbtou65GBH8PIb2GxMdmeWBQfCIq5ky3c2/svD+o\r
+       V1EFyvo3eOSqEGT+xEAtc94HkcBRT48QRfaWq18IwCpjx7yHczzce/6FWK+6iJ5/qx\r
+       3heNHsOjVVHocFrobgISiCMwViycfvk/nrIPo5tv/jACyKcyL4ZdlGHjy//m/hpsSq\r
+       QLa4NGhuKslKnG/ZO28NpZsIpNN2sMfbP8KZeNwD2C4RIMC883e2x75nQhP8E4CMNI\r
+       wruICUxrTNk84PghrXI68R+CvVP7fId1rvhmeA4dvV2GdYgkqY3XxF62TNMb/S+Tar\r
+       NbQcqaszrShoA==\r
+Cc: notmuch@notmuchmail.org\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Wed, 24 Sep 2014 21:39:21 -0000\r
+\r
+\r
+--/aVve/J9H4Wl5yVO\r
+Content-Type: text/plain; charset=us-ascii\r
+Content-Disposition: inline\r
+Content-Transfer-Encoding: quoted-printable\r
+\r
+On Wed, Sep 24, 2014 at 05:32:50PM -0400, Austin Clements wrote:\r
+> + * If the caller is currently in an atomic section (there was a\r
+> + * notmuch_database_begin_atomic without a matching\r
+> + * notmuch_database_end_atomic), this will abort the atomic section,\r
+> + * discarding any modifications made in the atomic section.  All\r
+> + * changes up to this will be committed.\r
+\r
+I still think Xapian's wording is more readable [1]:\r
+\r
+  For a WritableDatabase, if a transaction is active it will be\r
+  aborted, while if no transaction is active commit() will be\r
+  implicitly called.\r
+\r
+How about:\r
+\r
+  For a writable database, if a transaction is active (there was a\r
+  notmuch_database_begin_atomic without a matching\r
+  notmuch_database_end_atomic) it will be aborted, while if no\r
+  transaction is active any pending changes will be committed.\r
+\r
+Cheers,\r
+Trevor\r
+\r
+[1]: http://xapian.org/docs/apidoc/html/classXapian_1_1Database.html#a59f5f=\r
+8b137723dcaaabdbdccbc0cf1eb\r
+\r
+--=20\r
+This email may be signed or encrypted with GnuPG (http://www.gnupg.org).\r
+For more information, see http://en.wikipedia.org/wiki/Pretty_Good_Privacy\r
+\r
+--/aVve/J9H4Wl5yVO\r
+Content-Type: application/pgp-signature; name="signature.asc"\r
+Content-Description: OpenPGP digital signature\r
+\r
+-----BEGIN PGP SIGNATURE-----\r
+Version: GnuPG v2\r
+\r
+iQIbBAEBAgAGBQJUIzn8AAoJEG8/JgBt8ol8SQYP9ihcFBhpSiczMQM0iTuPKBrV\r
+cc6qh6KnQLf9U6BZDbFEO5Jf1jfk+y1j96229gwMYf7PXYPLXTyRX7tl4/8qNAQr\r
+9FDB/ChBUJNgSAONEVDdVMEAmkxKXf0XUoATrduhKT1gljlGLxcobqrp2/deCxny\r
+BHcGXLOqo2U8vtBlqRfqxE+4pm0y6bINQ6U5JXhiw5IYZMyyE3d7WgsPSFn0clFc\r
+/+BagDpqd+TGYvlT/A7htXBaUrqjCEOfX31JfblrmM50YXiHFPpEHSF/aFCUchT8\r
+FTLHuFXZemvHNeBbdTTR8PhdZJsDXM1ghDn4/CyMltwjNuKhnxlQ2YVWpiXhgfX6\r
+p180/p20WdJtr5O96c/SoYRbfqVhmuBegv+s59EcS4t3zbjDxJQ4LR+BaVyip1TZ\r
+UEwVc2MLYTF8nqlJcn5elbe7Xmh50q8mwh098cYbVh03DNlPJUvSRmBkYrjf2opN\r
+sTVnW4WwA7YcNdChsxami2bCr1umRPNDEwuEs937+MtWTVAtyM2TUIXRqqxxAu6v\r
+4uME+xIZgPdEljktlwk7KvBGSf4ABD1uZdFr7wVONiFsvFsg1pP91JJ+bDDgOXBv\r
+HRzxqqq9wosDxbHXtKNQVIMvGYZUfiWikzGwvMTYyRGH5I7c3FcVS2+Tbrmkwe8s\r
++DSeIXNIk6nxvyC51c4=\r
+=foFN\r
+-----END PGP SIGNATURE-----\r
+\r
+--/aVve/J9H4Wl5yVO--\r