--- /dev/null
+Return-Path: <amdragon@mit.edu>\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 79C06431FC2\r
+ for <notmuch@notmuchmail.org>; Thu, 30 May 2013 10:14:05 -0700 (PDT)\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 t5BhyrYwpLAh for <notmuch@notmuchmail.org>;\r
+ Thu, 30 May 2013 10:13:59 -0700 (PDT)\r
+Received: from dmz-mailsec-scanner-6.mit.edu (dmz-mailsec-scanner-6.mit.edu\r
+ [18.7.68.35])\r
+ by olra.theworths.org (Postfix) with ESMTP id 4F356431FC3\r
+ for <notmuch@notmuchmail.org>; Thu, 30 May 2013 10:13:47 -0700 (PDT)\r
+X-AuditID: 12074423-b7f826d000001438-3b-51a788ca245c\r
+Received: from mailhub-auth-1.mit.edu ( [18.9.21.35])\r
+ by dmz-mailsec-scanner-6.mit.edu (Symantec Messaging Gateway) with SMTP\r
+ id B4.40.05176.AC887A15; Thu, 30 May 2013 13:13:46 -0400 (EDT)\r
+Received: from outgoing.mit.edu (outgoing-auth-1.mit.edu [18.9.28.11])\r
+ by mailhub-auth-1.mit.edu (8.13.8/8.9.2) with ESMTP id r4UHDgEo027510; \r
+ Thu, 30 May 2013 13:13:43 -0400\r
+Received: from drake.dyndns.org (c-76-21-105-205.hsd1.ca.comcast.net\r
+ [76.21.105.205]) (authenticated bits=0)\r
+ (User authenticated as amdragon@ATHENA.MIT.EDU)\r
+ by outgoing.mit.edu (8.13.8/8.12.4) with ESMTP id r4UHDdS6009867\r
+ (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+ Thu, 30 May 2013 13:13:41 -0400\r
+Received: from amthrax by drake.dyndns.org with local (Exim 4.77)\r
+ (envelope-from <amdragon@mit.edu>)\r
+ id 1Ui6Py-0005r8-II; Thu, 30 May 2013 13:13:38 -0400\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v2 5/5] emacs: Use streaming S-expr parser for search\r
+Date: Thu, 30 May 2013 13:13:36 -0400\r
+Message-Id: <1369934016-22308-6-git-send-email-amdragon@mit.edu>\r
+X-Mailer: git-send-email 1.7.10.4\r
+In-Reply-To: <1369934016-22308-1-git-send-email-amdragon@mit.edu>\r
+References: <1369934016-22308-1-git-send-email-amdragon@mit.edu>\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFjrKIsWRmVeSWpSXmKPExsUixCmqrHuqY3mgwZ2zphar5/JYXL85k9ni\r
+ zcp5rA7MHjtn3WX3OPx1IYvHs1W3mAOYo7hsUlJzMstSi/TtErgyns9VKrguX/H+8FXGBsa3\r
+ kl2MnBwSAiYSUyd/YYWwxSQu3FvP1sXIxSEksI9R4kzvDlYIZyOjxM+pj6Cc00wSLQ8vsIO0\r
+ CAnMZZR4+K4AxGYT0JDYtn85I4gtIiAtsfPubLCxzAJxElum/AeLCwu4Sty4tpYZxGYRUJVo\r
+ P/+NCcTmFXCQeP3oMtQZihLdzyawgdicAo4SOyafZoXY5SBxae9XpgmM/AsYGVYxyqbkVunm\r
+ JmbmFKcm6xYnJ+blpRbpmunlZpbopaaUbmIEhRa7i/IOxj8HlQ4xCnAwKvHwZiQtDxRiTSwr\r
+ rsw9xCjJwaQkyru+FSjEl5SfUpmRWJwRX1Sak1p8iFGCg1lJhLfAGSjHm5JYWZValA+TkuZg\r
+ URLnvZZy019IID2xJDU7NbUgtQgmK8PBoSTBe70dqFGwKDU9tSItM6cEIc3EwQkynAdo+AWQ\r
+ Gt7igsTc4sx0iPwpRkUpcd77IAkBkERGaR5cLyz2XzGKA70izPsIpIoHmDbgul8BDWYCGvzE\r
+ GmxwSSJCSqqBUdq82tf658mXUx+mT5nUmlwr5/h7rYXI/NDzCVMDU1rn6PBoSexoF13zfP7k\r
+ urD+XClfyWgll1/5KcYc3O3Hv+wLy47seWs88bjzJdl2oZ0JZrtlKxNfu314WFid+y+nu+de\r
+ y5ddjMuL+W41fVnAbhZh7PNbVMN7A+8c07lfp/PtnFB/vtxaiaU4I9FQi7moOBEA+jVCVdgC AAA=\r
+Cc: tomi.ollila@iki.fi\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: Thu, 30 May 2013 17:14:05 -0000\r
+\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
+\r
projects / notmuch-archives.git / commitdiff