1 Return-Path: <bremner@tethera.net>
\r
2 X-Original-To: notmuch@notmuchmail.org
\r
3 Delivered-To: notmuch@notmuchmail.org
\r
4 Received: from localhost (localhost [127.0.0.1])
\r
5 by olra.theworths.org (Postfix) with ESMTP id 6E3C5431FAF
\r
6 for <notmuch@notmuchmail.org>; Sun, 18 Nov 2012 11:05:38 -0800 (PST)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]
\r
13 Received: from olra.theworths.org ([127.0.0.1])
\r
14 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
15 with ESMTP id JWMQoAS-F4WY for <notmuch@notmuchmail.org>;
\r
16 Sun, 18 Nov 2012 11:05:37 -0800 (PST)
\r
17 Received: from tesseract.cs.unb.ca (tesseract.cs.unb.ca [131.202.240.238])
\r
18 (using TLSv1 with cipher AES256-SHA (256/256 bits))
\r
19 (No client certificate requested)
\r
20 by olra.theworths.org (Postfix) with ESMTPS id 0036E429E27
\r
21 for <notmuch@notmuchmail.org>; Sun, 18 Nov 2012 11:05:19 -0800 (PST)
\r
22 Received: from fctnnbsc30w-156034089108.dhcp-dynamic.fibreop.nb.bellaliant.net
\r
23 ([156.34.89.108] helo=zancas.localnet)
\r
24 by tesseract.cs.unb.ca with esmtpsa
\r
25 (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.72)
\r
26 (envelope-from <bremner@tethera.net>)
\r
27 id 1TaABD-00028F-4p; Sun, 18 Nov 2012 15:05:19 -0400
\r
28 Received: from bremner by zancas.localnet with local (Exim 4.80)
\r
29 (envelope-from <bremner@tethera.net>)
\r
30 id 1TaAB7-0001JF-LR; Sun, 18 Nov 2012 15:05:13 -0400
\r
31 From: david@tethera.net
\r
32 To: notmuch@notmuchmail.org
\r
33 Subject: [PATCH 14/16] tag-util: optimization of tag application
\r
34 Date: Sun, 18 Nov 2012 15:04:56 -0400
\r
35 Message-Id: <1353265498-3839-15-git-send-email-david@tethera.net>
\r
36 X-Mailer: git-send-email 1.7.10.4
\r
37 In-Reply-To: <1353265498-3839-1-git-send-email-david@tethera.net>
\r
38 References: <1353265498-3839-1-git-send-email-david@tethera.net>
\r
40 Cc: David Bremner <bremner@debian.org>
\r
41 X-BeenThere: notmuch@notmuchmail.org
\r
42 X-Mailman-Version: 2.1.13
\r
44 List-Id: "Use and development of the notmuch mail system."
\r
45 <notmuch.notmuchmail.org>
\r
46 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
47 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
48 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
49 List-Post: <mailto:notmuch@notmuchmail.org>
\r
50 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
51 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
52 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
53 X-List-Received-Date: Sun, 18 Nov 2012 19:05:39 -0000
\r
55 From: David Bremner <bremner@debian.org>
\r
57 The idea is not to bother with restore operations if they don't change
\r
58 the set of tags. This is actually a relatively common case.
\r
60 In order to avoid fancy datastructures, this method is quadratic in
\r
61 the number of tags; at least on my mail database this doesn't seem to
\r
64 notmuch-tag.c | 2 +-
\r
65 tag-util.c | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
\r
67 3 files changed, 62 insertions(+), 2 deletions(-)
\r
69 diff --git a/notmuch-tag.c b/notmuch-tag.c
\r
70 index ca120d5..33cf78d 100644
\r
73 @@ -140,7 +140,7 @@ tag_query (void *ctx, notmuch_database_t *notmuch, const char *query_string,
\r
74 notmuch_messages_valid (messages) && ! interrupted;
\r
75 notmuch_messages_move_to_next (messages)) {
\r
76 message = notmuch_messages_get (messages);
\r
77 - tag_op_list_apply (message, tag_ops, flags);
\r
78 + tag_op_list_apply (message, tag_ops, flags | TAG_FLAG_PRE_OPTIMIZED);
\r
79 notmuch_message_destroy (message);
\r
82 diff --git a/tag-util.c b/tag-util.c
\r
83 index 5329b1f..de0928b 100644
\r
86 @@ -117,6 +117,62 @@ message_error (notmuch_message_t *message,
\r
87 fprintf (stderr, "Status: %s\n", notmuch_status_to_string (status));
\r
91 +makes_changes (notmuch_message_t *message,
\r
92 + tag_op_list_t *list,
\r
93 + tag_op_flag_t flags)
\r
98 + notmuch_tags_t *tags;
\r
99 + notmuch_bool_t changes = FALSE;
\r
101 + /* First, do we delete an existing tag? */
\r
103 + for (tags = notmuch_message_get_tags (message);
\r
104 + ! changes && notmuch_tags_valid (tags);
\r
105 + notmuch_tags_move_to_next (tags)) {
\r
106 + const char *cur_tag = notmuch_tags_get (tags);
\r
107 + int last_op = (flags & TAG_FLAG_REMOVE_ALL) ? -1 : 0;
\r
109 + for (i = 0; i < list->count; i++) {
\r
110 + if (strcmp (cur_tag, list->ops[i].tag) == 0) {
\r
111 + last_op = list->ops[i].remove ? -1 : 1;
\r
115 + changes = (last_op == -1);
\r
117 + notmuch_tags_destroy (tags);
\r
122 + /* Now check for adding new tags */
\r
123 + for (i = 0; i < list->count; i++) {
\r
124 + notmuch_bool_t exists = FALSE;
\r
126 + for (tags = notmuch_message_get_tags (message);
\r
127 + notmuch_tags_valid (tags);
\r
128 + notmuch_tags_move_to_next (tags)) {
\r
129 + const char *cur_tag = notmuch_tags_get (tags);
\r
130 + if (strcmp (cur_tag, list->ops[i].tag) == 0) {
\r
135 + notmuch_tags_destroy (tags);
\r
137 + /* the following test is conservative, it's ok to think we
\r
138 + * make changes when we don't */
\r
139 + if ( ! exists && ! list->ops[i].remove )
\r
147 tag_op_list_apply (notmuch_message_t *message,
\r
148 tag_op_list_t *list,
\r
149 @@ -127,6 +183,9 @@ tag_op_list_apply (notmuch_message_t *message,
\r
150 notmuch_status_t status = 0;
\r
151 tag_operation_t *tag_ops = list->ops;
\r
153 + if (! (flags & TAG_FLAG_PRE_OPTIMIZED) && ! makes_changes (message, list, flags))
\r
154 + return NOTMUCH_STATUS_SUCCESS;
\r
156 status = notmuch_message_freeze (message);
\r
158 message_error (message, status, "freezing message");
\r
159 diff --git a/tag-util.h b/tag-util.h
\r
160 index b381b8e..998c1b9 100644
\r
163 @@ -19,7 +19,8 @@ typedef struct {
\r
164 /* Use powers of 2 */
\r
165 typedef enum { TAG_FLAG_NONE = 0,
\r
166 TAG_FLAG_MAILDIR_SYNC = 1,
\r
167 - TAG_FLAG_REMOVE_ALL = 2 } tag_op_flag_t;
\r
168 + TAG_FLAG_REMOVE_ALL = 2,
\r
169 + TAG_FLAG_PRE_OPTIMIZED = 4 } tag_op_flag_t;
\r
172 typedef int (*tag_callback_t)(void *ctx,
\r