From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by olra.theworths.org (Postfix) with ESMTP id 1D12B431FC2 for ; Sat, 8 Dec 2012 14:57:57 -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 rKAMZPn6pWVK for ; Sat, 8 Dec 2012 14:57:55 -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 66D49429E47 for ; Sat, 8 Dec 2012 14:57:43 -0800 (PST) Received: from fctnnbsc30w-142167090129.dhcp-dynamic.fibreop.nb.bellaliant.net ([142.167.90.129] 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 1ThTL4-00066n-LF; Sat, 08 Dec 2012 18:57:42 -0400 Received: from bremner by zancas.localnet with local (Exim 4.80) (envelope-from ) id 1ThTKz-0000rD-5t; Sat, 08 Dec 2012 18:57:37 -0400 From: david@tethera.net To: notmuch@notmuchmail.org Subject: [Patch v5 11/11] tag-util: optimization of tag application Date: Sat, 8 Dec 2012 18:57:01 -0400 Message-Id: <1355007421-3069-12-git-send-email-david@tethera.net> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1355007421-3069-1-git-send-email-david@tethera.net> References: <1355007421-3069-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: Sat, 08 Dec 2012 22:57:57 -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. --- tag-util.c | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) diff --git a/tag-util.c b/tag-util.c index 164fdf0..e7233ab 100644 --- a/tag-util.c +++ b/tag-util.c @@ -151,6 +151,71 @@ 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) +{ + + size_t 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; + + /* scan backwards to get last operation */ + i = list->count; + while (i > 0) { + i--; + if (strcmp (cur_tag, list->ops[i].tag) == 0) { + last_op = list->ops[i].remove ? -1 : 1; + break; + } + } + + 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; + + if (list->ops[i].remove) + continue; + + 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, + * in the sense it ignores cases like +foo ... -foo + * but this is OK from a correctness point of view + */ + if (! exists) + return TRUE; + } + return FALSE; + +} + notmuch_status_t tag_op_list_apply (notmuch_message_t *message, tag_op_list_t *list, @@ -160,6 +225,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"); -- 1.7.10.4