--- /dev/null
+Return-Path: <bremner@tethera.net>\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 EF0EE431FB6\r
+ for <notmuch@notmuchmail.org>; Sat, 24 Nov 2012 13:20:49 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
+ 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 MLMEYppo2iXn for <notmuch@notmuchmail.org>;\r
+ Sat, 24 Nov 2012 13:20:48 -0800 (PST)\r
+Received: from tesseract.cs.unb.ca (tesseract.cs.unb.ca [131.202.240.238])\r
+ (using TLSv1 with cipher AES256-SHA (256/256 bits))\r
+ (No client certificate requested)\r
+ by olra.theworths.org (Postfix) with ESMTPS id 8FC0D431FDE\r
+ for <notmuch@notmuchmail.org>; Sat, 24 Nov 2012 13:20:34 -0800 (PST)\r
+Received: from fctnnbsc30w-156034089108.dhcp-dynamic.fibreop.nb.bellaliant.net\r
+ ([156.34.89.108] helo=zancas.localnet)\r
+ by tesseract.cs.unb.ca with esmtpsa\r
+ (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.72)\r
+ (envelope-from <bremner@tethera.net>)\r
+ id 1TcN9N-0006SX-Ni; Sat, 24 Nov 2012 17:20:34 -0400\r
+Received: from bremner by zancas.localnet with local (Exim 4.80)\r
+ (envelope-from <bremner@tethera.net>)\r
+ id 1TcN9I-0008Di-7w; Sat, 24 Nov 2012 17:20:28 -0400\r
+From: david@tethera.net\r
+To: notmuch@notmuchmail.org\r
+Subject: [Patch v2 17/17] tag-util: optimization of tag application\r
+Date: Sat, 24 Nov 2012 17:20:17 -0400\r
+Message-Id: <1353792017-31459-18-git-send-email-david@tethera.net>\r
+X-Mailer: git-send-email 1.7.10.4\r
+In-Reply-To: <1353792017-31459-1-git-send-email-david@tethera.net>\r
+References: <1353792017-31459-1-git-send-email-david@tethera.net>\r
+X-Spam_bar: -\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, 24 Nov 2012 21:20:50 -0000\r
+\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
+ notmuch-tag.c | 2 +-\r
+ tag-util.c | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++\r
+ 2 files changed, 60 insertions(+), 1 deletion(-)\r
+\r
+diff --git a/notmuch-tag.c b/notmuch-tag.c\r
+index 8a8af0b..e4fca67 100644\r
+--- a/notmuch-tag.c\r
++++ b/notmuch-tag.c\r
+@@ -140,7 +140,7 @@ tag_query (void *ctx, notmuch_database_t *notmuch, const char *query_string,\r
+ notmuch_messages_valid (messages) && ! interrupted;\r
+ notmuch_messages_move_to_next (messages)) {\r
+ message = notmuch_messages_get (messages);\r
+- tag_op_list_apply (message, tag_ops, flags);\r
++ tag_op_list_apply (message, tag_ops, flags | TAG_FLAG_PRE_OPTIMIZED);\r
+ notmuch_message_destroy (message);\r
+ }\r
+ \r
+diff --git a/tag-util.c b/tag-util.c\r
+index 287cc67..2bb8355 100644\r
+--- a/tag-util.c\r
++++ b/tag-util.c\r
+@@ -111,6 +111,62 @@ 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
++ int 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
++ for (i = 0; i < list->count; i++) {\r
++ if (strcmp (cur_tag, list->ops[i].tag) == 0) {\r
++ last_op = list->ops[i].remove ? -1 : 1;\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
++ 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, it's ok to think we\r
++ * make changes when we don't */\r
++ if ( ! exists && ! list->ops[i].remove )\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
+@@ -121,6 +177,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
projects / notmuch-archives.git / commitdiff