Re: [PATCH 0/2] A bug in the exclude code

diff --git a/b8/1026d7e16a4412ba3bd65eb3ce6090125a1426 b/b8/1026d7e16a4412ba3bd65eb3ce6090125a1426
new file mode 100644 (file)
index 0000000..16c16fd
--- /dev/null
+++ b/b8/1026d7e16a4412ba3bd65eb3ce6090125a1426
@@ -0,0 +1,102 @@
+Return-Path: <amdragon@mit.edu>\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 D9F94431FAF\r
+       for <notmuch@notmuchmail.org>; Tue, 13 Mar 2012 19:08:27 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+       tests=[RCVD_IN_DNSWL_LOW=-0.7] 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 3aX30kmmW5Hj for <notmuch@notmuchmail.org>;\r
+       Tue, 13 Mar 2012 19:08:27 -0700 (PDT)\r
+Received: from dmz-mailsec-scanner-3.mit.edu (DMZ-MAILSEC-SCANNER-3.MIT.EDU\r
+       [18.9.25.14])\r
+       by olra.theworths.org (Postfix) with ESMTP id 5D26C431FAE\r
+       for <notmuch@notmuchmail.org>; Tue, 13 Mar 2012 19:08:27 -0700 (PDT)\r
+X-AuditID: 1209190e-b7f7c6d0000008c3-f2-4f5ffd9aa935\r
+Received: from mailhub-auth-1.mit.edu ( [18.9.21.35])\r
+       by dmz-mailsec-scanner-3.mit.edu (Symantec Messaging Gateway) with SMTP\r
+       id 11.A1.02243.A9DFF5F4; Tue, 13 Mar 2012 22:08:26 -0400 (EDT)\r
+Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
+       by mailhub-auth-1.mit.edu (8.13.8/8.9.2) with ESMTP id q2E28PAX004993; \r
+       Tue, 13 Mar 2012 22:08:26 -0400\r
+Received: from awakening.csail.mit.edu (awakening.csail.mit.edu [18.26.4.91])\r
+       (authenticated bits=0)\r
+       (User authenticated as amdragon@ATHENA.MIT.EDU)\r
+       by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id q2E28OXp019206\r
+       (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+       Tue, 13 Mar 2012 22:08:25 -0400 (EDT)\r
+Received: from amthrax by awakening.csail.mit.edu with local (Exim 4.77)\r
+       (envelope-from <amdragon@mit.edu>)\r
+       id 1S7ddY-0005nx-3l; Tue, 13 Mar 2012 22:08:24 -0400\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: Mark Walters <markwalters1009@gmail.com>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH 0/2] A bug in the exclude code\r
+In-Reply-To: <1331551914-28323-1-git-send-email-markwalters1009@gmail.com>\r
+References: <1331551914-28323-1-git-send-email-markwalters1009@gmail.com>\r
+User-Agent: Notmuch/0.11.1+252~gdf1a6d5 (http://notmuchmail.org) Emacs/23.3.1\r
+       (i486-pc-linux-gnu)\r
+Date: Tue, 13 Mar 2012 22:08:24 -0400\r
+Message-ID: <87mx7kndd3.fsf@awakening.csail.mit.edu>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFnrAIsWRmVeSWpSXmKPExsUixCmqrDvrb7y/weo+LYvVc3ksrt+cyezA\r
+       5LFz1l12j2erbjEHMEVx2aSk5mSWpRbp2yVwZXz/9IOxYCZXxbmG1ywNjH/Yuxg5OSQETCSe\r
+       nmtmhrDFJC7cW8/WxcjFISSwj1Hi8KU1jBDOBkaJz4fWsUI4J5kkjm9dDZVZwijx48RnVpB+\r
+       NgENiW37lzOC2CICrhJPv30GmyssYCRx5tMPsH2cAl4Saz68ArOFBDwlevZ+YAGxRQUSJdZ3\r
+       3mcCsVkEVCW+bz8JFOfg4AW6r+d6NEiYV0BQ4uTMJ2DlzAJaEjf+vWSawCgwC0lqFpLUAkam\r
+       VYyyKblVurmJmTnFqcm6xcmJeXmpRbrGermZJXqpKaWbGMEBKcm3g/HrQaVDjAIcjEo8vMK1\r
+       8f5CrIllxZW5hxglOZiURHkj3wKF+JLyUyozEosz4otKc1KLDzFKcDArifC+mAqU401JrKxK\r
+       LcqHSUlzsCiJ86ppvfMTEkhPLEnNTk0tSC2CycpwcChJ8KqADBUsSk1PrUjLzClBSDNxcIIM\r
+       5wEaXv4dZHhxQWJucWY6RP4Uo6KUOO+dN0AJAZBERmkeXC8sYbxiFAd6RZh3JUgVDzDZwHW/\r
+       AhrMBDS45FscyOCSRISUVANjPMt1tlXv72TtOpfmnZu7XvuGgV935m1fJjHezX9idkXdKlk4\r
+       U2d/WF61mvmqOdedGVmzXr+Z5bd4X27tc7erLwu25e85FFO8znhJp33CnB/aawLW75Dr39zx\r
+       vpSl/UjJxLsXZ0sGbN+9bbFM49YlSk3v8u982m24OfS6lNJJ625ZC+8Ve5wmKbEUZyQaajEX\r
+       FScCAEt4Sm3zAgAA\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, 14 Mar 2012 02:08:28 -0000\r
+\r
+On Mon, 12 Mar 2012 11:31:52 +0000, Mark Walters <markwalters1009@gmail.com> wrote:\r
+> There is a bug in the exclude code (found by jrollins in the\r
+> --with-excluded series) but also present in master.  None of the\r
+> current tests were finding it so the first patch adds two tests.\r
+> \r
+> The bug (and test failure) do not appear in all configuations: on my\r
+> main test machine (an oldish debian testing 32bit userspace with a\r
+> 64bit kernel and xapian 1.2.7) all tests pass. On my laptop (a recent\r
+> debian testing 64bit userspace and xapian 1.2.8) one of the new tests\r
+> fails.\r
+> \r
+> The second patch fixes the behaviour for me but I don't see why it\r
+> should make a difference: searches for A and not B should give the\r
+> same results as A and not (A and B). It could be a bug in xapian, it\r
+> could be that I am not allowed to reuse queries as I do (is query1 =\r
+> query1 and query2 allowed?) or it could be some memory use bug on my\r
+> part.\r
+> \r
+> Anyway the "fix" is small which should help narrow down the actual\r
+> cause.\r
+\r
+LGTM.  Even if we don't totally understand the root cause here, this\r
+change is the right thing to do anyway.\r
+\r
+I think it's fine to go ahead and push this ahead of the other exclude\r
+updates, though obviously those will need a little rebasing on top of\r
+this.\r