--- /dev/null
+Return-Path: <jani@nikula.org>\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 7045D431FAF\r
+ for <notmuch@notmuchmail.org>; Sun, 2 Dec 2012 06:42:23 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+ tests=[RCVD_IN_DNSWL_LOW=-0.7] 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 CIJgjHjkayEV for <notmuch@notmuchmail.org>;\r
+ Sun, 2 Dec 2012 06:42:19 -0800 (PST)\r
+Received: from mail-lb0-f181.google.com (mail-lb0-f181.google.com\r
+ [209.85.217.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+ (No client certificate requested)\r
+ by olra.theworths.org (Postfix) with ESMTPS id B2ADA431FAE\r
+ for <notmuch@notmuchmail.org>; Sun, 2 Dec 2012 06:42:18 -0800 (PST)\r
+Received: by mail-lb0-f181.google.com with SMTP id ge1so1790567lbb.26\r
+ for <notmuch@notmuchmail.org>; Sun, 02 Dec 2012 06:42:17 -0800 (PST)\r
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+ d=google.com; s=20120113;\r
+ h=from:to:cc:subject:in-reply-to:references:user-agent:date\r
+ :message-id:mime-version:content-type:x-gm-message-state;\r
+ bh=XxZDRzfk1zO5LuVqfSjhThU6FJaR8zl08ZgYXq3yTVk=;\r
+ b=gdbKe4ojBA4kpYhNG84JmRyfoqhZgIjwPbxpGxQ4ftrS0GwXL8s5wsoyqk3h/z6B/F\r
+ md5GDJVQ+TdeY2z/jU0PB/4oUuNwM0FI6rb5MG2P9zMYE663+bqCmclImGYJweAe3m4G\r
+ YtaAZjLvo1wFIRakXaldFIFfNX6LgJsdiUgXrnmxbjXgtuE1RI3WjPvCg+mbjquPhBAv\r
+ SFi5+F6PsdOoeE7+9J8cSgk8JO40WieF75MJZyNUOnqS+NueFojnNjPk1yjDglbPThaw\r
+ PW5gh9m6uGLCKqYo/V3gdcFbAKVPIW/xIqA+rT8NUYyconiFOePnBYCfV9b0rGlH3U6g\r
+ NADg==\r
+Received: by 10.112.49.167 with SMTP id v7mr3165890lbn.122.1354459335873;\r
+ Sun, 02 Dec 2012 06:42:15 -0800 (PST)\r
+Received: from localhost (dsl-hkibrasgw4-fe51df00-27.dhcp.inet.fi.\r
+ [80.223.81.27])\r
+ by mx.google.com with ESMTPS id v6sm4197127lbf.11.2012.12.02.06.42.13\r
+ (version=SSLv3 cipher=OTHER); Sun, 02 Dec 2012 06:42:14 -0800 (PST)\r
+From: Jani Nikula <jani@nikula.org>\r
+To: david@tethera.net, notmuch@notmuchmail.org\r
+Subject: Re: [Patch v2 17/17] tag-util: optimization of tag application\r
+In-Reply-To: <1353792017-31459-18-git-send-email-david@tethera.net>\r
+References: <1353792017-31459-1-git-send-email-david@tethera.net>\r
+ <1353792017-31459-18-git-send-email-david@tethera.net>\r
+User-Agent: Notmuch/0.14+124~g3b17402 (http://notmuchmail.org) Emacs/23.4.1\r
+ (i686-pc-linux-gnu)\r
+Date: Sun, 02 Dec 2012 16:42:12 +0200\r
+Message-ID: <87txs4cy7v.fsf@nikula.org>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\r
+X-Gm-Message-State:\r
+ ALoCoQkWGwgv9AMGeWAoWMdfxZHI42CEc1twFZ3so6RaVfwuYvj/X2nIFeLg94O1+7DB9VI+X16k\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: Sun, 02 Dec 2012 14:42:23 -0000\r
+\r
+On Sat, 24 Nov 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
+It's bound to be slower than the original optimization using strcmp, but\r
+that was based on a number of assumptions we can no longer make. In any\r
+case, not doing message sync is the key optimization.\r
+\r
+One side effect of any optimization (also the existing one) is not doing\r
+maildir sync from tags to flags when there are no tag changes. This just\r
+emphasizes that one should never do dump or restore with the mail store\r
+and database out of sync. I don't think we emphasize the importance of\r
+running notmuch new before dump and restore enough.\r
+\r
+A few more comments below.\r
+\r
+BR,\r
+Jani.\r
+\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
+If you looped from end to beginning, you could break on first match.\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
+\r
+I think you can do:\r
+\r
+ if (list->ops[i].remove)\r
+ continue;\r
+\r
+here and remove the check on .remove below.\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
+\r
+I think it's "too" conservative only when the input has e.g. "+foo\r
+-foo", but I wouldn't worry about optimizing that.\r
+\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
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> http://notmuchmail.org/mailman/listinfo/notmuch\r
projects / notmuch-archives.git / commitdiff