--- /dev/null
+Return-Path: <m.walters@qmul.ac.uk>\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 88A3A431FC0\r
+ for <notmuch@notmuchmail.org>; Tue, 21 May 2013 07:27:57 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -1.098\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-1.098 tagged_above=-999 required=5\r
+ tests=[DKIM_ADSP_CUSTOM_MED=0.001, FREEMAIL_FROM=0.001,\r
+ NML_ADSP_CUSTOM_MED=1.2, RCVD_IN_DNSWL_MED=-2.3] 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 Ewzg5Nalgrk8 for <notmuch@notmuchmail.org>;\r
+ Tue, 21 May 2013 07:27:51 -0700 (PDT)\r
+Received: from mail2.qmul.ac.uk (mail2.qmul.ac.uk [138.37.6.6])\r
+ (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))\r
+ (No client certificate requested)\r
+ by olra.theworths.org (Postfix) with ESMTPS id 58D8F431FB6\r
+ for <notmuch@notmuchmail.org>; Tue, 21 May 2013 07:27:51 -0700 (PDT)\r
+Received: from smtp.qmul.ac.uk ([138.37.6.40])\r
+ by mail2.qmul.ac.uk with esmtp (Exim 4.71)\r
+ (envelope-from <m.walters@qmul.ac.uk>)\r
+ id 1UenXZ-0007Rb-IR; Tue, 21 May 2013 15:27:50 +0100\r
+Received: from 93-97-24-31.zone5.bethere.co.uk ([93.97.24.31] helo=localhost)\r
+ by smtp.qmul.ac.uk with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.71)\r
+ (envelope-from <m.walters@qmul.ac.uk>)\r
+ id 1UenXY-00021j-PR; Tue, 21 May 2013 15:27:49 +0100\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: Austin Clements <amdragon@MIT.EDU>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH 5/5] emacs: Use streaming S-expr parser for search\r
+In-Reply-To: <1368851472-5382-6-git-send-email-amdragon@mit.edu>\r
+References: <1368851472-5382-1-git-send-email-amdragon@mit.edu>\r
+ <1368851472-5382-6-git-send-email-amdragon@mit.edu>\r
+User-Agent: Notmuch/0.14+255~gff3cc55 (http://notmuchmail.org) Emacs/23.4.1\r
+ (x86_64-pc-linux-gnu)\r
+Date: Tue, 21 May 2013 15:27:47 +0100\r
+Message-ID: <87ip2c2ysc.fsf@qmul.ac.uk>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\r
+X-Sender-Host-Address: 93.97.24.31\r
+X-QM-SPAM-Info: Sender has good ham record. :)\r
+X-QM-Body-MD5: b0822419b61b875fb8fac3e08803688d (of first 20000 bytes)\r
+X-SpamAssassin-Score: -0.2\r
+X-SpamAssassin-SpamBar: /\r
+X-SpamAssassin-Report: The QM spam filters have analysed this message to\r
+ determine if it is\r
+ spam. We require at least 5.0 points to mark a message as spam.\r
+ This message scored -0.2 points.\r
+ Summary of the scoring: \r
+ * 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail\r
+ provider * (markwalters1009[at]gmail.com)\r
+ * -0.2 AWL AWL: From: address is in the auto white-list\r
+X-QM-Scan-Virus: ClamAV says the message is clean\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: Tue, 21 May 2013 14:27:57 -0000\r
+\r
+\r
+This patch and patch 3/5 look good to me. Do you intend to take out the\r
+async json parser immediately after this goes in? If not then I think it\r
+would be good to tweak the arguments/error handling in the json parser\r
+so that it matches that in this sexp parser.\r
+\r
+Best wishes\r
+\r
+Mark\r
+\r
+On Sat, 18 May 2013, Austin Clements <amdragon@MIT.EDU> wrote:\r
+> In addition to being the Right Thing to do, this noticeably improves\r
+> the time taken to display the first page of search results, since it's\r
+> roughly an order of magnitude faster than the JSON parser.\r
+> Interestingly, it does *not* significantly improve the time to\r
+> completely fill a large search buffer because for large search\r
+> buffers, the cost of creating author invisibility overlays and\r
+> inserting text (which slows down with more overlays) dominates.\r
+> However, the time required to display the first page of results is\r
+> generally more important to the user experience.\r
+> ---\r
+> emacs/notmuch.el | 13 +++----------\r
+> test/emacs | 10 +++-------\r
+> 2 files changed, 6 insertions(+), 17 deletions(-)\r
+>\r
+> diff --git a/emacs/notmuch.el b/emacs/notmuch.el\r
+> index b8d9c44..5a8c957 100644\r
+> --- a/emacs/notmuch.el\r
+> +++ b/emacs/notmuch.el\r
+> @@ -58,6 +58,7 @@\r
+> (require 'notmuch-hello)\r
+> (require 'notmuch-maildir-fcc)\r
+> (require 'notmuch-message)\r
+> +(require 'notmuch-parser)\r
+> \r
+> (defcustom notmuch-search-result-format\r
+> `(("date" . "%12s ")\r
+> @@ -809,13 +810,6 @@ non-authors is found, assume that all of the authors match."\r
+> (setq notmuch-search-target-thread "found")\r
+> (goto-char beg)))))\r
+> \r
+> -(defun notmuch-search-show-error (string &rest objects)\r
+> - (save-excursion\r
+> - (goto-char (point-max))\r
+> - (insert "Error: Unexpected output from notmuch search:\n")\r
+> - (insert (apply #'format string objects))\r
+> - (insert "\n")))\r
+> -\r
+> (defun notmuch-search-process-filter (proc string)\r
+> "Process and filter the output of \"notmuch search\""\r
+> (let ((results-buf (process-buffer proc))\r
+> @@ -829,8 +823,7 @@ non-authors is found, assume that all of the authors match."\r
+> (save-excursion\r
+> (goto-char (point-max))\r
+> (insert string))\r
+> - (notmuch-json-parse-partial-list 'notmuch-search-show-result\r
+> - 'notmuch-search-show-error\r
+> + (notmuch-sexp-parse-partial-list 'notmuch-search-show-result\r
+> results-buf)))))\r
+> \r
+> (defun notmuch-search-tag-all (&optional tag-changes)\r
+> @@ -933,7 +926,7 @@ Other optional parameters are used as follows:\r
+> (save-excursion\r
+> (let ((proc (notmuch-start-notmuch\r
+> "notmuch-search" buffer #'notmuch-search-process-sentinel\r
+> - "search" "--format=json" "--format-version=1"\r
+> + "search" "--format=sexp" "--format-version=1"\r
+> (if oldest-first\r
+> "--sort=oldest-first"\r
+> "--sort=newest-first")\r
+> diff --git a/test/emacs b/test/emacs\r
+> index d38ae8c..7d42abf 100755\r
+> --- a/test/emacs\r
+> +++ b/test/emacs\r
+> @@ -856,7 +856,7 @@ test_expect_success "Rendering HTML mail with images" \\r
+> test_begin_subtest "Search handles subprocess error exit codes"\r
+> cat > notmuch_fail <<EOF\r
+> #!/bin/sh\r
+> -echo This is output\r
+> +echo '()'\r
+> exit 1\r
+> EOF\r
+> chmod a+x notmuch_fail\r
+> @@ -871,21 +871,19 @@ test_emacs "(let ((notmuch-command \"$PWD/notmuch_fail\"))\r
+> (test-output))"\r
+> sed -i -e 's/^\[.*\]$/[XXX]/' ERROR\r
+> test_expect_equal "$(cat OUTPUT; echo ---; cat MESSAGES; echo ---; cat ERROR)" "\\r
+> -Error: Unexpected output from notmuch search:\r
+> -This is output\r
+> End of search results.\r
+> ---\r
+> $PWD/notmuch_fail exited with status 1 (see *Notmuch errors* for more details)\r
+> ---\r
+> [XXX]\r
+> $PWD/notmuch_fail exited with status 1\r
+> -command: $PWD/notmuch_fail search --format\=json --format-version\=1 --sort\=newest-first tag\:inbox\r
+> +command: $PWD/notmuch_fail search --format\=sexp --format-version\=1 --sort\=newest-first tag\:inbox\r
+> exit status: 1"\r
+> \r
+> test_begin_subtest "Search handles subprocess warnings"\r
+> cat > notmuch_fail <<EOF\r
+> #!/bin/sh\r
+> -echo This is output\r
+> +echo '()'\r
+> echo This is a warning >&2\r
+> echo This is another warning >&2\r
+> exit 0\r
+> @@ -903,8 +901,6 @@ test_emacs "(let ((notmuch-command \"$PWD/notmuch_fail\"))\r
+> (test-output))"\r
+> sed -i -e 's/^\[.*\]$/[XXX]/' ERROR\r
+> test_expect_equal "$(cat OUTPUT; echo ---; cat MESSAGES; echo ---; cat ERROR)" "\\r
+> -Error: Unexpected output from notmuch search:\r
+> -This is output\r
+> End of search results.\r
+> ---\r
+> This is a warning (see *Notmuch errors* for more details)\r
+> -- \r
+> 1.7.10.4\r
projects / notmuch-archives.git / commitdiff