--- /dev/null
+Return-Path: <m.walters@qmul.ac.uk>\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 0F055431FAF\r
+ for <notmuch@notmuchmail.org>; Sat, 8 Dec 2012 03:22:51 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -1.098\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-1.098 tagged_above=-999 required=5\r
+ tests=[DKIM_ADSP_CUSTOM_MED=0.001, FREEMAIL_FROM=0.001,\r
+ NML_ADSP_CUSTOM_MED=1.2, RCVD_IN_DNSWL_MED=-2.3] 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 ap35AObs0HbJ for <notmuch@notmuchmail.org>;\r
+ Sat, 8 Dec 2012 03:22:50 -0800 (PST)\r
+Received: from mail2.qmul.ac.uk (mail2.qmul.ac.uk [138.37.6.6])\r
+ (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))\r
+ (No client certificate requested)\r
+ by olra.theworths.org (Postfix) with ESMTPS id 53F7C431FAE\r
+ for <notmuch@notmuchmail.org>; Sat, 8 Dec 2012 03:22:50 -0800 (PST)\r
+Received: from smtp.qmul.ac.uk ([138.37.6.40])\r
+ by mail2.qmul.ac.uk with esmtp (Exim 4.71)\r
+ (envelope-from <m.walters@qmul.ac.uk>)\r
+ id 1ThIUa-0001Ld-J9; Sat, 08 Dec 2012 11:22:48 +0000\r
+Received: from 93-97-24-31.zone5.bethere.co.uk ([93.97.24.31] helo=localhost)\r
+ by smtp.qmul.ac.uk with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.69)\r
+ (envelope-from <m.walters@qmul.ac.uk>)\r
+ id 1ThIUa-0006lB-67; Sat, 08 Dec 2012 11:22:48 +0000\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: david@tethera.net, notmuch@notmuchmail.org\r
+Subject: Re: [Patch v3b 9/9] tag-util: optimization of tag application\r
+In-Reply-To: <1354843607-17980-10-git-send-email-david@tethera.net>\r
+References: <1354843607-17980-1-git-send-email-david@tethera.net>\r
+ <1354843607-17980-10-git-send-email-david@tethera.net>\r
+User-Agent: Notmuch/0.14+81~g9730584 (http://notmuchmail.org) Emacs/23.4.1\r
+ (x86_64-pc-linux-gnu)\r
+Date: Sat, 08 Dec 2012 11:22:53 +0000\r
+Message-ID: <87zk1og54i.fsf@qmul.ac.uk>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\r
+X-Sender-Host-Address: 93.97.24.31\r
+X-QM-SPAM-Info: Sender has good ham record. :)\r
+X-QM-Body-MD5: 2100af87dc12ae39309909ab44db1033 (of first 20000 bytes)\r
+X-SpamAssassin-Score: -1.8\r
+X-SpamAssassin-SpamBar: -\r
+X-SpamAssassin-Report: The QM spam filters have analysed this message to\r
+ determine if it is\r
+ spam. We require at least 5.0 points to mark a message as spam.\r
+ This message scored -1.8 points.\r
+ Summary of the scoring: \r
+ * -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/,\r
+ * medium trust\r
+ * [138.37.6.40 listed in list.dnswl.org]\r
+ * 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail\r
+ provider * (markwalters1009[at]gmail.com)\r
+ * 0.5 AWL AWL: From: address is in the auto white-list\r
+X-QM-Scan-Virus: ClamAV says the message is clean\r
+Cc: David Bremner <bremner@debian.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: Sat, 08 Dec 2012 11:22:51 -0000\r
+\r
+On Fri, 07 Dec 2012, david@tethera.net wrote:\r
+> From: David Bremner <bremner@debian.org>\r
+>\r
+> The idea is not to bother with restore operations if they don't change\r
+> the set of tags. This is actually a relatively common case.\r
+>\r
+> In order to avoid fancy datastructures, this method is quadratic in\r
+> the number of tags; at least on my mail database this doesn't seem to\r
+> be a big problem.\r
+> ---\r
+> tag-util.c | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\r
+> 1 file changed, 66 insertions(+)\r
+>\r
+> diff --git a/tag-util.c b/tag-util.c\r
+> index 932ee7f..3d54e9e 100644\r
+> --- a/tag-util.c\r
+> +++ b/tag-util.c\r
+> @@ -124,6 +124,69 @@ message_error (notmuch_message_t *message,\r
+> fprintf (stderr, "Status: %s\n", notmuch_status_to_string (status));\r
+> }\r
+> \r
+> +static int\r
+> +makes_changes (notmuch_message_t *message,\r
+> + tag_op_list_t *list,\r
+> + tag_op_flag_t flags)\r
+> +{\r
+> +\r
+> + size_t i;\r
+> +\r
+> + notmuch_tags_t *tags;\r
+> + notmuch_bool_t changes = FALSE;\r
+> +\r
+> + /* First, do we delete an existing tag? */\r
+> + changes = FALSE;\r
+> + for (tags = notmuch_message_get_tags (message);\r
+> + ! changes && notmuch_tags_valid (tags);\r
+> + notmuch_tags_move_to_next (tags)) {\r
+> + const char *cur_tag = notmuch_tags_get (tags);\r
+> + int last_op = (flags & TAG_FLAG_REMOVE_ALL) ? -1 : 0;\r
+> +\r
+> + /* slight contortions to count down with an unsigned index */\r
+> + for (i = list->count; i-- > 0; /*nothing*/) {\r
+> + if (strcmp (cur_tag, list->ops[i].tag) == 0) {\r
+> + last_op = list->ops[i].remove ? -1 : 1;\r
+> + break;\r
+> + }\r
+> + }\r
+\r
+I agree that this is a little ugly but ok I think. Is it worth adding a\r
+comment as to why you are counting backwards? eg " we count backwards to\r
+check whether the last change for the tag foo is removal"\r
+\r
+But basically LGTM\r
+\r
+Mark\r
+\r
+\r
+> +\r
+> + changes = (last_op == -1);\r
+> + }\r
+> + notmuch_tags_destroy (tags);\r
+> +\r
+> + if (changes)\r
+> + return TRUE;\r
+> +\r
+> + /* Now check for adding new tags */\r
+> + for (i = 0; i < list->count; i++) {\r
+> + notmuch_bool_t exists = FALSE;\r
+> +\r
+> + if (list->ops[i].remove)\r
+> + continue;\r
+> +\r
+> + for (tags = notmuch_message_get_tags (message);\r
+> + notmuch_tags_valid (tags);\r
+> + notmuch_tags_move_to_next (tags)) {\r
+> + const char *cur_tag = notmuch_tags_get (tags);\r
+> + if (strcmp (cur_tag, list->ops[i].tag) == 0) {\r
+> + exists = TRUE;\r
+> + break;\r
+> + }\r
+> + }\r
+> + notmuch_tags_destroy (tags);\r
+> +\r
+> + /* the following test is conservative,\r
+> + * in the sense it ignores cases like +foo ... -foo\r
+> + * but this is OK from a correctness point of view\r
+> + */\r
+> + if (! exists)\r
+> + return TRUE;\r
+> + }\r
+> + return FALSE;\r
+> +\r
+> +}\r
+> +\r
+> notmuch_status_t\r
+> tag_op_list_apply (notmuch_message_t *message,\r
+> tag_op_list_t *list,\r
+> @@ -133,6 +196,9 @@ tag_op_list_apply (notmuch_message_t *message,\r
+> notmuch_status_t status = 0;\r
+> tag_operation_t *tag_ops = list->ops;\r
+> \r
+> + if (! (flags & TAG_FLAG_PRE_OPTIMIZED) && ! makes_changes (message, list, flags))\r
+> + return NOTMUCH_STATUS_SUCCESS;\r
+> +\r
+> status = notmuch_message_freeze (message);\r
+> if (status) {\r
+> message_error (message, status, "freezing message");\r
+> -- \r
+> 1.7.10.4\r
+>\r
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> http://notmuchmail.org/mailman/listinfo/notmuch\r
projects / notmuch-archives.git / commitdiff