From 36463d3b415c79314ed5e8ba39f85feeb423390c Mon Sep 17 00:00:00 2001 From: Mark Walters Date: Wed, 9 Oct 2013 08:38:36 +0100 Subject: [PATCH] Re: [PATCH 07/11] emacs: Use notmuch tag --batch for large tag queries --- b6/4de82030a8b459343da4c2947bbde86bb826ad | 178 ++++++++++++++++++++++ 1 file changed, 178 insertions(+) create mode 100644 b6/4de82030a8b459343da4c2947bbde86bb826ad diff --git a/b6/4de82030a8b459343da4c2947bbde86bb826ad b/b6/4de82030a8b459343da4c2947bbde86bb826ad new file mode 100644 index 000000000..8beb3395c --- /dev/null +++ b/b6/4de82030a8b459343da4c2947bbde86bb826ad @@ -0,0 +1,178 @@ +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 38159431FAF + for ; Wed, 9 Oct 2013 00:38:55 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: -1.098 +X-Spam-Level: +X-Spam-Status: No, score=-1.098 tagged_above=-999 required=5 + tests=[DKIM_ADSP_CUSTOM_MED=0.001, FREEMAIL_FROM=0.001, + NML_ADSP_CUSTOM_MED=1.2, RCVD_IN_DNSWL_MED=-2.3] 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 2hRCTbBlXW6A for ; + Wed, 9 Oct 2013 00:38:47 -0700 (PDT) +Received: from mail2.qmul.ac.uk (mail2.qmul.ac.uk [138.37.6.6]) + (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id E9E35431FAE + for ; Wed, 9 Oct 2013 00:38:46 -0700 (PDT) +Received: from smtp.qmul.ac.uk ([138.37.6.40]) + by mail2.qmul.ac.uk with esmtp (Exim 4.71) + (envelope-from ) + id 1VToLu-0000mr-9W; Wed, 09 Oct 2013 08:38:40 +0100 +Received: from 93-97-24-31.zone5.bethere.co.uk ([93.97.24.31] helo=localhost) + by smtp.qmul.ac.uk with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.71) + (envelope-from ) + id 1VToLt-0000sU-VK; Wed, 09 Oct 2013 08:38:38 +0100 +From: Mark Walters +To: Jani Nikula , Austin Clements , + notmuch@notmuchmail.org +Subject: Re: [PATCH 07/11] emacs: Use notmuch tag --batch for large tag + queries +In-Reply-To: <87iox6ap58.fsf@nikula.org> +References: <1381185201-25197-1-git-send-email-amdragon@mit.edu> + <1381185201-25197-8-git-send-email-amdragon@mit.edu> + <87iox6ap58.fsf@nikula.org> +User-Agent: Notmuch/0.15.2+334~gafd5c6a (http://notmuchmail.org) Emacs/23.4.1 + (x86_64-pc-linux-gnu) +Date: Wed, 09 Oct 2013 08:38:36 +0100 +Message-ID: <87d2ne28sj.fsf@qmul.ac.uk> +MIME-Version: 1.0 +Content-Type: text/plain; charset=us-ascii +X-Sender-Host-Address: 93.97.24.31 +X-QM-SPAM-Info: Sender has good ham record. :) +X-QM-Body-MD5: fadffa8711d1d661b877541c7a9665ab (of first 20000 bytes) +X-SpamAssassin-Score: 0.0 +X-SpamAssassin-SpamBar: / +X-SpamAssassin-Report: The QM spam filters have analysed this message to + determine if it is + spam. We require at least 5.0 points to mark a message as spam. + This message scored 0.0 points. Summary of the scoring: + * 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail + provider * (markwalters1009[at]gmail.com) + * 0.0 AWL AWL: From: address is in the auto white-list +X-QM-Scan-Virus: ClamAV says the message is clean +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, 09 Oct 2013 07:38:55 -0000 + + +On Wed, 09 Oct 2013, Jani Nikula wrote: +> On Tue, 08 Oct 2013, Austin Clements wrote: +>> (Unfortunately, it's difficult to first demonstrate this problem with +>> a known-broken test because modern Linux kernels have argument length +>> limits in the megabytes, which makes Emacs really slow!) +>> --- +>> emacs/notmuch-lib.el | 8 ++++++++ +>> emacs/notmuch-tag.el | 12 ++++++++++-- +>> test/emacs | 8 ++++++++ +>> 3 files changed, 26 insertions(+), 2 deletions(-) +>> +>> diff --git a/emacs/notmuch-lib.el b/emacs/notmuch-lib.el +>> index 22156f1..348112b 100644 +>> --- a/emacs/notmuch-lib.el +>> +++ b/emacs/notmuch-lib.el +>> @@ -261,6 +261,14 @@ user-friendly queries." +>> "Return a query that matches the message with id ID." +>> (concat "id:" (notmuch-escape-boolean-term id))) +>> +>> +(defun notmuch-hex-encode (str) +>> + "Hex-encode STR (e.g., as used by batch tagging). +>> + +>> +This replaces spaces, percents, and double quotes in STR with +>> +%NN where NN is the hexadecimal value of the character." +>> + (replace-regexp-in-string +>> + "[ %\"]" (lambda (match) (format "%%%02x" (aref match 0))) str)) +>> + +>> ;; +>> +>> (defun notmuch-common-do-stash (text) +>> diff --git a/emacs/notmuch-tag.el b/emacs/notmuch-tag.el +>> index 064cfa8..a4eec14 100644 +>> --- a/emacs/notmuch-tag.el +>> +++ b/emacs/notmuch-tag.el +>> @@ -242,6 +242,8 @@ from TAGS if present." +>> (error "Changed tag must be of the form `+this_tag' or `-that_tag'"))))) +>> (sort result-tags 'string<))) +>> +>> +(defconst notmuch-tag-argument-limit 1000) +>> + +>> (defun notmuch-tag (query &optional tag-changes) +>> "Add/remove tags in TAG-CHANGES to messages matching QUERY. +>> +>> @@ -268,8 +270,14 @@ notmuch-after-tag-hook will be run." +>> tag-changes) +>> (unless (null tag-changes) +>> (run-hooks 'notmuch-before-tag-hook) +>> - (apply 'notmuch-call-notmuch-process "tag" +>> - (append tag-changes (list "--" query))) +>> + (if (<= (length query) notmuch-tag-argument-limit) +>> + (apply 'notmuch-call-notmuch-process "tag" +>> + (append tag-changes (list "--" query))) +>> + ;; Use batch tag mode to avoid argument length limitations +>> + (let ((batch-op (concat (mapconcat #'notmuch-hex-encode tag-changes " ") +>> + " -- " query))) +>> + (message "Batch tagging with %s" batch-op) +> +> Why the message? +> +> Jani. + +I had missed that: this message is presumably for debugging as it +includes the (possibly megabyte sized) query. I think some message would +be sensible as this could be a slow operation so it's probably worth +telling the user why the interface has locked. + +Best wishes + +Mark + +> +>> + (notmuch-call-notmuch-process :stdin-string batch-op "tag" "--batch"))) +>> (run-hooks 'notmuch-after-tag-hook)) +>> ;; in all cases we return tag-changes as a list +>> tag-changes) +>> diff --git a/test/emacs b/test/emacs +>> index 05295af..2917189 100755 +>> --- a/test/emacs +>> +++ b/test/emacs +>> @@ -122,6 +122,14 @@ test_emacs "(notmuch-search \"$os_x_darwin_thread\") +>> output=$(notmuch search $os_x_darwin_thread | notmuch_search_sanitize) +>> test_expect_equal "$output" "thread:XXX 2009-11-18 [4/4] Jjgod Jiang, Alexander Botero-Lowry; [notmuch] Mac OS X/Darwin compatibility issues (inbox unread)" +>> +>> +test_begin_subtest "Add tag (large query)" +>> +# We use a long query to force us into batch mode and use a funny tag +>> +# that requires escaping for batch tagging. +>> +test_emacs "(notmuch-tag (concat \"$os_x_darwin_thread\" \" or \" (make-string notmuch-tag-argument-limit ?x)) \"+tag-from-%-large-query\")" +>> +output=$(notmuch search $os_x_darwin_thread | notmuch_search_sanitize) +>> +test_expect_equal "$output" "thread:XXX 2009-11-18 [4/4] Jjgod Jiang, Alexander Botero-Lowry; [notmuch] Mac OS X/Darwin compatibility issues (inbox tag-from-%-large-query unread)" +>> +notmuch tag -tag-from-%-large-query $os_x_darwin_thread +>> + +>> test_begin_subtest "notmuch-show: add single tag to single message" +>> test_emacs "(notmuch-show \"$os_x_darwin_thread\") +>> (execute-kbd-macro \"+tag-from-show-view\")" +>> -- +>> 1.8.4.rc3 +>> +>> _______________________________________________ +>> notmuch mailing list +>> notmuch@notmuchmail.org +>> http://notmuchmail.org/mailman/listinfo/notmuch +> _______________________________________________ +> notmuch mailing list +> notmuch@notmuchmail.org +> http://notmuchmail.org/mailman/listinfo/notmuch -- 2.26.2