From: Mark Walters Date: Tue, 8 Oct 2013 07:27:12 +0000 (+0100) Subject: Re: [PATCH 07/11] emacs: Use notmuch tag --batch for large tag queries X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=2cf3715c6762d5747a35d799d1ff2af92b802ce4;p=notmuch-archives.git Re: [PATCH 07/11] emacs: Use notmuch tag --batch for large tag queries --- diff --git a/85/dd59e0d3d29973c44179ea0825b5dd8574f66d b/85/dd59e0d3d29973c44179ea0825b5dd8574f66d new file mode 100644 index 000000000..d3022eb81 --- /dev/null +++ b/85/dd59e0d3d29973c44179ea0825b5dd8574f66d @@ -0,0 +1,164 @@ +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 2356C431FAF + for ; Tue, 8 Oct 2013 00:27:27 -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 rOgJuPvERXCH for ; + Tue, 8 Oct 2013 00:27:20 -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 D0444431FAE + for ; Tue, 8 Oct 2013 00:27:19 -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 1VTRhJ-00079J-8J; Tue, 08 Oct 2013 08:27:18 +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 1VTRhI-0003a1-TV; Tue, 08 Oct 2013 08:27:13 +0100 +From: Mark Walters +To: Austin Clements , notmuch@notmuchmail.org +Subject: Re: [PATCH 07/11] emacs: Use notmuch tag --batch for large tag + queries +In-Reply-To: <1381185201-25197-8-git-send-email-amdragon@mit.edu> +References: <1381185201-25197-1-git-send-email-amdragon@mit.edu> + <1381185201-25197-8-git-send-email-amdragon@mit.edu> +User-Agent: Notmuch/0.16 (http://notmuchmail.org) Emacs/23.4.1 + (x86_64-pc-linux-gnu) +Date: Tue, 08 Oct 2013 08:27:12 +0100 +Message-ID: <87vc18rzn3.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: 2461cb8702d68c66d6081ab66dc5e6ec (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: Tue, 08 Oct 2013 07:27:27 -0000 + +On Mon, 07 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) +> + + +Another triviality: I think this should have a doc string saying use +batch tag if the query is longer than this. + +The other patches in the series up to this point LGTM. + +Mark + + +> (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) +> + (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