From 238d604a00de88ec7184f25f898ebe1b60c98685 Mon Sep 17 00:00:00 2001 From: david Date: Mon, 19 Nov 2012 15:04:56 +2000 Subject: [PATCH] [PATCH 14/16] tag-util: optimization of tag application --- 85/4445559a652b48bdf3f700f9fd87c6945652d9 | 175 ++++++++++++++++++++++ 1 file changed, 175 insertions(+) create mode 100644 85/4445559a652b48bdf3f700f9fd87c6945652d9 diff --git a/85/4445559a652b48bdf3f700f9fd87c6945652d9 b/85/4445559a652b48bdf3f700f9fd87c6945652d9 new file mode 100644 index 000000000..89c4a5299 --- /dev/null +++ b/85/4445559a652b48bdf3f700f9fd87c6945652d9 @@ -0,0 +1,175 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id 6E3C5431FAF + for ; Sun, 18 Nov 2012 11:05:38 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 0 +X-Spam-Level: +X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none] + autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id JWMQoAS-F4WY for ; + Sun, 18 Nov 2012 11:05:37 -0800 (PST) +Received: from tesseract.cs.unb.ca (tesseract.cs.unb.ca [131.202.240.238]) + (using TLSv1 with cipher AES256-SHA (256/256 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 0036E429E27 + for ; Sun, 18 Nov 2012 11:05:19 -0800 (PST) +Received: from fctnnbsc30w-156034089108.dhcp-dynamic.fibreop.nb.bellaliant.net + ([156.34.89.108] helo=zancas.localnet) + by tesseract.cs.unb.ca with esmtpsa + (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.72) + (envelope-from ) + id 1TaABD-00028F-4p; Sun, 18 Nov 2012 15:05:19 -0400 +Received: from bremner by zancas.localnet with local (Exim 4.80) + (envelope-from ) + id 1TaAB7-0001JF-LR; Sun, 18 Nov 2012 15:05:13 -0400 +From: david@tethera.net +To: notmuch@notmuchmail.org +Subject: [PATCH 14/16] tag-util: optimization of tag application +Date: Sun, 18 Nov 2012 15:04:56 -0400 +Message-Id: <1353265498-3839-15-git-send-email-david@tethera.net> +X-Mailer: git-send-email 1.7.10.4 +In-Reply-To: <1353265498-3839-1-git-send-email-david@tethera.net> +References: <1353265498-3839-1-git-send-email-david@tethera.net> +X-Spam_bar: - +Cc: David Bremner +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Sun, 18 Nov 2012 19:05:39 -0000 + +From: David Bremner + +The idea is not to bother with restore operations if they don't change +the set of tags. This is actually a relatively common case. + +In order to avoid fancy datastructures, this method is quadratic in +the number of tags; at least on my mail database this doesn't seem to +be a big problem. +--- + notmuch-tag.c | 2 +- + tag-util.c | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + tag-util.h | 3 ++- + 3 files changed, 62 insertions(+), 2 deletions(-) + +diff --git a/notmuch-tag.c b/notmuch-tag.c +index ca120d5..33cf78d 100644 +--- a/notmuch-tag.c ++++ b/notmuch-tag.c +@@ -140,7 +140,7 @@ tag_query (void *ctx, notmuch_database_t *notmuch, const char *query_string, + notmuch_messages_valid (messages) && ! interrupted; + notmuch_messages_move_to_next (messages)) { + message = notmuch_messages_get (messages); +- tag_op_list_apply (message, tag_ops, flags); ++ tag_op_list_apply (message, tag_ops, flags | TAG_FLAG_PRE_OPTIMIZED); + notmuch_message_destroy (message); + } + +diff --git a/tag-util.c b/tag-util.c +index 5329b1f..de0928b 100644 +--- a/tag-util.c ++++ b/tag-util.c +@@ -117,6 +117,62 @@ message_error (notmuch_message_t *message, + fprintf (stderr, "Status: %s\n", notmuch_status_to_string (status)); + } + ++static int ++makes_changes (notmuch_message_t *message, ++ tag_op_list_t *list, ++ tag_op_flag_t flags) ++{ ++ ++ int i; ++ ++ notmuch_tags_t *tags; ++ notmuch_bool_t changes = FALSE; ++ ++ /* First, do we delete an existing tag? */ ++ changes = FALSE; ++ for (tags = notmuch_message_get_tags (message); ++ ! changes && notmuch_tags_valid (tags); ++ notmuch_tags_move_to_next (tags)) { ++ const char *cur_tag = notmuch_tags_get (tags); ++ int last_op = (flags & TAG_FLAG_REMOVE_ALL) ? -1 : 0; ++ ++ for (i = 0; i < list->count; i++) { ++ if (strcmp (cur_tag, list->ops[i].tag) == 0) { ++ last_op = list->ops[i].remove ? -1 : 1; ++ } ++ } ++ ++ changes = (last_op == -1); ++ } ++ notmuch_tags_destroy (tags); ++ ++ if (changes) ++ return TRUE; ++ ++ /* Now check for adding new tags */ ++ for (i = 0; i < list->count; i++) { ++ notmuch_bool_t exists = FALSE; ++ ++ for (tags = notmuch_message_get_tags (message); ++ notmuch_tags_valid (tags); ++ notmuch_tags_move_to_next (tags)) { ++ const char *cur_tag = notmuch_tags_get (tags); ++ if (strcmp (cur_tag, list->ops[i].tag) == 0) { ++ exists = TRUE; ++ break; ++ } ++ } ++ notmuch_tags_destroy (tags); ++ ++ /* the following test is conservative, it's ok to think we ++ * make changes when we don't */ ++ if ( ! exists && ! list->ops[i].remove ) ++ return TRUE; ++ } ++ return FALSE; ++ ++} ++ + notmuch_status_t + tag_op_list_apply (notmuch_message_t *message, + tag_op_list_t *list, +@@ -127,6 +183,9 @@ tag_op_list_apply (notmuch_message_t *message, + notmuch_status_t status = 0; + tag_operation_t *tag_ops = list->ops; + ++ if (! (flags & TAG_FLAG_PRE_OPTIMIZED) && ! makes_changes (message, list, flags)) ++ return NOTMUCH_STATUS_SUCCESS; ++ + status = notmuch_message_freeze (message); + if (status) { + message_error (message, status, "freezing message"); +diff --git a/tag-util.h b/tag-util.h +index b381b8e..998c1b9 100644 +--- a/tag-util.h ++++ b/tag-util.h +@@ -19,7 +19,8 @@ typedef struct { + /* Use powers of 2 */ + typedef enum { TAG_FLAG_NONE = 0, + TAG_FLAG_MAILDIR_SYNC = 1, +- TAG_FLAG_REMOVE_ALL = 2 } tag_op_flag_t; ++ TAG_FLAG_REMOVE_ALL = 2, ++ TAG_FLAG_PRE_OPTIMIZED = 4 } tag_op_flag_t; + + + typedef int (*tag_callback_t)(void *ctx, +-- +1.7.10.4 + -- 2.26.2