From c187bc977e3d788a7bf0e00bd3d48030b2d16300 Mon Sep 17 00:00:00 2001 From: David Edmondson Date: Wed, 8 Feb 2012 16:43:15 +0000 Subject: [PATCH] [PATCH v4] emacs: Call "notmuch tag" once when applying tag changes to a thread. --- 1d/4664864d537f7f8d55fca4980489cd3e73f0a0 | 116 ++++++++++++++++++++++ 1 file changed, 116 insertions(+) create mode 100644 1d/4664864d537f7f8d55fca4980489cd3e73f0a0 diff --git a/1d/4664864d537f7f8d55fca4980489cd3e73f0a0 b/1d/4664864d537f7f8d55fca4980489cd3e73f0a0 new file mode 100644 index 000000000..ae4316779 --- /dev/null +++ b/1d/4664864d537f7f8d55fca4980489cd3e73f0a0 @@ -0,0 +1,116 @@ +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 20375431FAF + for ; Wed, 8 Feb 2012 08:43:23 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: -0.7 +X-Spam-Level: +X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5 + tests=[RCVD_IN_DNSWL_LOW=-0.7] 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 cMW6S8zsDrmC for ; + Wed, 8 Feb 2012 08:43:22 -0800 (PST) +Received: from mail-wi0-f181.google.com (mail-wi0-f181.google.com + [209.85.212.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 62AA3431FAE + for ; Wed, 8 Feb 2012 08:43:22 -0800 (PST) +Received: by wibhi8 with SMTP id hi8so581880wib.26 + for ; Wed, 08 Feb 2012 08:43:19 -0800 (PST) +Received: by 10.180.108.232 with SMTP id hn8mr41994257wib.16.1328719399738; + Wed, 08 Feb 2012 08:43:19 -0800 (PST) +Received: from hotblack-desiato.hh.sledj.net + (host81-149-164-25.in-addr.btopenworld.com. [81.149.164.25]) + by mx.google.com with ESMTPS id dr5sm4624285wib.0.2012.02.08.08.43.17 + (version=TLSv1/SSLv3 cipher=OTHER); + Wed, 08 Feb 2012 08:43:18 -0800 (PST) +Received: by hotblack-desiato.hh.sledj.net (Postfix, from userid 30000) + id 4CC9FA065C; Wed, 8 Feb 2012 16:43:16 +0000 (GMT) +From: David Edmondson +To: notmuch@notmuchmail.org +Subject: [PATCH v4] emacs: Call "notmuch tag" once when applying tag changes + to a thread. +Date: Wed, 8 Feb 2012 16:43:15 +0000 +Message-Id: <1328719395-6333-1-git-send-email-dme@dme.org> +X-Mailer: git-send-email 1.7.8.3 +In-Reply-To: <1328632303-31877-1-git-send-email-jani@nikula.org> +References: <1328632303-31877-1-git-send-email-jani@nikula.org> +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: Wed, 08 Feb 2012 16:43:23 -0000 + +Optimize thread tagging by combining all the tagging operations to a +single "notmuch tag" call. + +For threads in the order of tens or a hundred inbox tagged messages, +this gives a noticeable speedup. On two different machines, archiving +a thread of about 50 inbox tagged messages goes down from 10+ seconds +to about 0.5 seconds. + +The bottleneck is not within emacs; the same behaviour can be observed +in the CLI. This approach has the added benefit of being more +reliable: any of the individual tagging operations might face a locked +database, leading to partial results. + +This introduces a limitation to the number of messages that can be +archived at the same time (through ARG_MAX limiting the command +line). While at least on Linux this seems more like a theoretical +limitation than a real one, it could be avoided by archiving at most a +few hundred messages at a time. + +Based on code from Jani Nikula . +--- + +v4: +- Rebased after Dmitry's tagging changes (yay!). + + emacs/notmuch-show.el | 18 +++++++++++------- + 1 files changed, 11 insertions(+), 7 deletions(-) + +diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el +index faa9f9b..9294bc8 100644 +--- a/emacs/notmuch-show.el ++++ b/emacs/notmuch-show.el +@@ -1599,14 +1599,18 @@ argument, hide all of the messages." + (backward-button 1)) + + (defun notmuch-show-tag-thread-internal (tag &optional remove) +- "Add tag to the current set of messages. ++ "Add TAG to the current set of messages. + +-If the remove switch is given, tags will be removed instead of +-added." +- (goto-char (point-min)) +- (let ((op (if remove "-" "+"))) +- (loop do (notmuch-show-tag-message (concat op tag)) +- until (not (notmuch-show-goto-message-next))))) ++If REMOVE is non-nil, TAG will be removed rather than added." ++ (save-excursion ++ (goto-char (point-min)) ++ (let ((tag-op (concat (if remove "-" "+") tag)) ++ (message-ids ++ (loop collect (notmuch-show-get-message-id) ++ until (not (notmuch-show-goto-message-next))))) ++ (if message-ids ++ (notmuch-tag (mapconcat #'identity message-ids " OR ") ++ tag-op))))) + + (defun notmuch-show-add-tag-thread (tag) + "Add tag to all messages in the current thread." +-- +1.7.8.3 + -- 2.26.2