--- /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 EC828431FAF\r
+ for <notmuch@notmuchmail.org>; Fri, 7 Dec 2012 15:08:09 -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 bGWztGmn5j8s for <notmuch@notmuchmail.org>;\r
+ Fri, 7 Dec 2012 15:08:09 -0800 (PST)\r
+Received: from mail-la0-f53.google.com (mail-la0-f53.google.com\r
+ [209.85.215.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+ (No client certificate requested)\r
+ by olra.theworths.org (Postfix) with ESMTPS id 1AAD2431FAE\r
+ for <notmuch@notmuchmail.org>; Fri, 7 Dec 2012 15:08:08 -0800 (PST)\r
+Received: by mail-la0-f53.google.com with SMTP id w12so759565lag.26\r
+ for <notmuch@notmuchmail.org>; Fri, 07 Dec 2012 15:08:07 -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=W3GtL9C/N4jEo4hdJ5LuhelJ4ShHs4BfkjWyTZIvI8E=;\r
+ b=VGCGNtR93kJmRW6nmw3NrzhBhMdxQSNPNNAF72Q/IzN5QRlQP9lHxhg+vLlh3encha\r
+ pccsvvUmYXSDlLstTaJDYs3iyr1llq61VZsxM2P2oULO4HLBBVzB+0ysKM4/n3tskHhx\r
+ TWVpfjNs1UQrlgQ/FzaOS9nTLTGoBzIgVU2tXrbfbHZgrv5v0jsccp0pm6YfLst06gqK\r
+ arG3jqeJkeNSV/AM9mv5pepMqeEqSsvKwPRSoraMSYcLmc6h4YeIVAKlcn/zVYfYFNmc\r
+ 2PNr4Q6m1AQAfvwOUDGcUZIxGeJjKW5lFnFlOZJ/r9ab+y55/jeyqRTddwV/08Yhee31\r
+ 4rdA==\r
+Received: by 10.152.122.133 with SMTP id ls5mr7068383lab.9.1354921687320;\r
+ Fri, 07 Dec 2012 15:08:07 -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 pw17sm5111006lab.5.2012.12.07.15.08.05\r
+ (version=SSLv3 cipher=OTHER); Fri, 07 Dec 2012 15:08:06 -0800 (PST)\r
+From: Jani Nikula <jani@nikula.org>\r
+To: david@tethera.net, notmuch@notmuchmail.org\r
+Subject: Re: [Patch v3b 9/9] tag-util: optimization of tag application\r
+In-Reply-To: <1354843607-17980-10-git-send-email-david@tethera.net>\r
+References: <1354843607-17980-1-git-send-email-david@tethera.net>\r
+ <1354843607-17980-10-git-send-email-david@tethera.net>\r
+User-Agent: Notmuch/0.14+138~g7041c56 (http://notmuchmail.org) Emacs/23.4.1\r
+ (i686-pc-linux-gnu)\r
+Date: Sat, 08 Dec 2012 01:08:04 +0200\r
+Message-ID: <87lid9xxyj.fsf@nikula.org>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\r
+X-Gm-Message-State:\r
+ ALoCoQkvdwbESM9NtmeIMe7OgETTO3ZRPHpZ32rwp2oNRFo9TV4CrOsch+70qaNRIhLEDjmGd8O/\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: Fri, 07 Dec 2012 23:08:10 -0000\r
+\r
+On Fri, 07 Dec 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
+> tag-util.c | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\r
+> 1 file changed, 66 insertions(+)\r
+>\r
+> diff --git a/tag-util.c b/tag-util.c\r
+> index 932ee7f..3d54e9e 100644\r
+> --- a/tag-util.c\r
+> +++ b/tag-util.c\r
+> @@ -124,6 +124,69 @@ 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
+> + size_t 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
+> + /* slight contortions to count down with an unsigned index */\r
+> + for (i = list->count; i-- > 0; /*nothing*/) {\r
+> + if (strcmp (cur_tag, list->ops[i].tag) == 0) {\r
+> + last_op = list->ops[i].remove ? -1 : 1;\r
+> + break;\r
+> + }\r
+> + }\r
+\r
+After some eyeballing it looks correct, but not not exactly pretty. If\r
+you insist on unsigned, you could also have a regular (i = 0; i <\r
+list->count; i++) and use j = list->count - i - 1; within the block. But\r
+that's just style bikeshedding after convincing you to use a count down\r
+loop in the first place...\r
+\r
+Otherwise, the patch LGTM.\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
+> + if (list->ops[i].remove)\r
+> + continue;\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,\r
+> + * in the sense it ignores cases like +foo ... -foo\r
+> + * but this is OK from a correctness point of view\r
+> + */\r
+> + if (! exists)\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
+> @@ -133,6 +196,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