Re: [PATCH 06/11] lib: Internal support for querying and creating ghost messages

diff --git a/28/8ab7e379e09d10f501499ac7ae754c8837e7cf b/28/8ab7e379e09d10f501499ac7ae754c8837e7cf
new file mode 100644 (file)
index 0000000..5070730
--- /dev/null
+++ b/28/8ab7e379e09d10f501499ac7ae754c8837e7cf
@@ -0,0 +1,102 @@
+Return-Path: <aclements@csail.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 1B28A431FB6\r
+       for <notmuch@notmuchmail.org>; Mon,  6 Oct 2014 09:04:07 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -2.024\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-2.024 tagged_above=-999 required=5\r
+       tests=[RCVD_IN_DNSWL_MED=-2.3, URIBL_RHS_DOB=0.276] 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 hRskUs3EE4zB for <notmuch@notmuchmail.org>;\r
+       Mon,  6 Oct 2014 09:03:58 -0700 (PDT)\r
+Received: from outgoing.csail.mit.edu (outgoing.csail.mit.edu [128.30.2.149])\r
+       by olra.theworths.org (Postfix) with ESMTP id 8ADA6431FAE\r
+       for <notmuch@notmuchmail.org>; Mon,  6 Oct 2014 09:03:58 -0700 (PDT)\r
+Received: from [104.131.20.129] (helo=awakeningjr)\r
+       by outgoing.csail.mit.edu with esmtpsa (TLS1.0:RSA_AES_128_CBC_SHA1:16)\r
+       (Exim 4.72) (envelope-from <aclements@csail.mit.edu>)\r
+       id 1XbAlQ-0001OJ-VP; Mon, 06 Oct 2014 12:03:57 -0400\r
+Received: from amthrax by awakeningjr with local (Exim 4.84)\r
+       (envelope-from <aclements@csail.mit.edu>)\r
+       id 1XbAlQ-0001CN-KL; Mon, 06 Oct 2014 12:03:56 -0400\r
+From: Austin Clements <aclements@csail.mit.edu>\r
+To: David Bremner <david@tethera.net>\r
+Subject: Re: [PATCH 06/11] lib: Internal support for querying and creating\r
+       ghost   messages\r
+In-Reply-To: <87y4stoh41.fsf@maritornes.cs.unb.ca>\r
+References: <1412345958-8278-1-git-send-email-aclements@csail.mit.edu>\r
+       <1412345958-8278-7-git-send-email-aclements@csail.mit.edu>\r
+       <87fvf2q5p5.fsf@maritornes.cs.unb.ca>\r
+       <20141005232400.GC7970@csail.mit.edu>\r
+       <87y4stoh41.fsf@maritornes.cs.unb.ca>\r
+User-Agent: Notmuch/0.18.1+86~gef5e66a (http://notmuchmail.org) Emacs/24.3.1\r
+       (x86_64-pc-linux-gnu)\r
+Date: Mon, 06 Oct 2014 12:03:56 -0400\r
+Message-ID: <87k34dchhv.fsf@csail.mit.edu>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain\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: Mon, 06 Oct 2014 16:04:07 -0000\r
+\r
+On Mon, 06 Oct 2014, David Bremner <david@tethera.net> wrote:\r
+> Austin Clements <aclements@csail.mit.edu> writes:\r
+>\r
+>>\r
+>> I'm used to reading this stuff, so either way is fine with me.  Do we\r
+>> have bit set / clear / read macros?\r
+>>\r
+>\r
+> I guess not. the things we have in query.cc are related but different.\r
+\r
+I added some macros for doing this to notmuch-private.h and converted\r
+the other bit twiddling for message flags to use these.\r
+\r
+>>> > +        else if (*i == "Tghost")\r
+>>> > +            message->flags |= (1 << NOTMUCH_MESSAGE_FLAG_GHOST);\r
+>>> > +        else\r
+>>> \r
+>>> It makes me faintly unhappy to have the prefix hardcoded here.\r
+>>> Not sure if there is a sensible solution.\r
+>>\r
+>> I agree, but I also don't want to construct the test string every time\r
+>> or deconstruct the term string every time.  I could move the "T"\r
+>> prefix string to a #define and use that both here and in\r
+>> BOOLEAN_PREFIX_INTERNAL, but that solution may be worse than the\r
+>> problem.  What do you think?\r
+>\r
+> Maybe just a comment to point to BOOLEAN_PREFIX_INTERNAL.\r
+>\r
+> Or maybe define a macro right beside BOOLEAN_PREFIX_INTERNAL like\r
+>\r
+> #define ADD_TYPE_PREFIX(s) "T" s\r
+>\r
+> At least then the duplication is all in one place.\r
+\r
+A #define by BOOLEAN_PREFIX_INTERNAL won't help because\r
+BOOLEAN_PREFIX_INTERNAL lives in database.cc and this code is in\r
+message.cc.  I would have to put the #define in one of the private\r
+headers, but I could use it in BOOLEAN_PREFIX_INTERNAL so there wouldn't\r
+be any duplication of the "T" string.\r
+\r
+I added a comment pointing to BOOLEAN_PREFIX_INTERNAL.  Maybe that's\r
+enough?\r
+\r
+I'll post v2 later today, when I can run the test suite (currently\r
+running on battery).\r