From c0f62ff3647b78e6341dc7727c1d75e9cacbf924 Mon Sep 17 00:00:00 2001 From: Austin Clements Date: Sun, 19 May 2013 00:31:12 +2000 Subject: [PATCH] [PATCH 5/5] emacs: Use streaming S-expr parser for search --- c1/7ab396688e260a1ee314235d27b25a89399636 | 180 ++++++++++++++++++++++ 1 file changed, 180 insertions(+) create mode 100644 c1/7ab396688e260a1ee314235d27b25a89399636 diff --git a/c1/7ab396688e260a1ee314235d27b25a89399636 b/c1/7ab396688e260a1ee314235d27b25a89399636 new file mode 100644 index 000000000..7de3b3004 --- /dev/null +++ b/c1/7ab396688e260a1ee314235d27b25a89399636 @@ -0,0 +1,180 @@ +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 E80EA429E27 + for ; Fri, 17 May 2013 21:33:08 -0700 (PDT) +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 qNx0cGONGkaf for ; + Fri, 17 May 2013 21:33:02 -0700 (PDT) +Received: from dmz-mailsec-scanner-1.mit.edu (DMZ-MAILSEC-SCANNER-1.MIT.EDU + [18.9.25.12]) + by olra.theworths.org (Postfix) with ESMTP id 4312E429E30 + for ; Fri, 17 May 2013 21:32:25 -0700 (PDT) +X-AuditID: 1209190c-b7f566d000004c69-92-51970458ba7c +Received: from mailhub-auth-2.mit.edu ( [18.7.62.36]) + by dmz-mailsec-scanner-1.mit.edu (Symantec Messaging Gateway) with SMTP + id 51.A4.19561.85407915; Sat, 18 May 2013 00:32:24 -0400 (EDT) +Received: from outgoing.mit.edu (OUTGOING-AUTH-1.MIT.EDU [18.9.28.11]) + by mailhub-auth-2.mit.edu (8.13.8/8.9.2) with ESMTP id r4I4WD1t016939; + Sat, 18 May 2013 00:32:13 -0400 +Received: from drake.dyndns.org + (216-15-114-40.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com + [216.15.114.40]) (authenticated bits=0) + (User authenticated as amdragon@ATHENA.MIT.EDU) + by outgoing.mit.edu (8.13.8/8.12.4) with ESMTP id r4I4WBoQ018837 + (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT); + Sat, 18 May 2013 00:32:12 -0400 +Received: from amthrax by drake.dyndns.org with local (Exim 4.77) + (envelope-from ) + id 1UdYo1-0001Z2-Lh; Sat, 18 May 2013 00:31:41 -0400 +From: Austin Clements +To: notmuch@notmuchmail.org +Subject: [PATCH 5/5] emacs: Use streaming S-expr parser for search +Date: Sat, 18 May 2013 00:31:12 -0400 +Message-Id: <1368851472-5382-6-git-send-email-amdragon@mit.edu> +X-Mailer: git-send-email 1.7.10.4 +In-Reply-To: <1368851472-5382-1-git-send-email-amdragon@mit.edu> +References: <1368851472-5382-1-git-send-email-amdragon@mit.edu> +X-Brightmail-Tracker: + H4sIAAAAAAAAA+NgFtrFIsWRmVeSWpSXmKPExsUixG6nohvBMj3Q4GKnocXquTwW12/OZHZg + 8tg56y67x7NVt5gDmKK4bFJSczLLUov07RK4Mp7PVSq4Ll/x/vBVxgbGt5JdjJwcEgImElse + t7JA2GISF+6tZwOxhQT2MUqsX5cLYW9klFj617iLkQvIvsMksWLhI2YIZy6jxJqGO+wgVWwC + GhLb9i9nBLFFBKQldt6dzQpiMws4SnzevwhsqrCAk8Tsf//AbBYBVYnd5/6C2bwC9hIvvj1n + h7hCUaL72QSwOKeAg8Th+cegLrKX6Lpwk20CI/8CRoZVjLIpuVW6uYmZOcWpybrFyYl5ealF + uoZ6uZkleqkppZsYQUHEKcmzg/HNQaVDjAIcjEo8vB9cpwUKsSaWFVfmHmKU5GBSEuU1+QcU + 4kvKT6nMSCzOiC8qzUktPsQowcGsJML7vBgox5uSWFmVWpQPk5LmYFES572cctNfSCA9sSQ1 + OzW1ILUIJivDwaEkwVvEPD1QSLAoNT21Ii0zpwQhzcTBCTKcB2i4FUgNb3FBYm5xZjpE/hSj + opQ4bzFIQgAkkVGaB9cLi/JXjOJArwjzSoNU8QATBFz3K6DBTECDWa9NBRlckoiQkmpg3BHc + bRz5yvsX/47W9CcG+fHf1TMVyv+sYZmlb2iv8usAg3uc5JNJQK9N3GWgOJk3f7XeDM7YJZ6J + iff+hDtfZ/lTW7Gr6Vh2tNPM+9NUlgqHKDuFWNiumy9y+w1nzErW64KHeD2KeFONOLuLlq6c + nRLUe/RkQ1z3RYaoJa8OGVvfdlnleEmJpTgj0VCLuag4EQC3mWWVzQIAAA== +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: Sat, 18 May 2013 04:33:09 -0000 + +In addition to being the Right Thing to do, this noticeably improves +the time taken to display the first page of search results, since it's +roughly an order of magnitude faster than the JSON parser. +Interestingly, it does *not* significantly improve the time to +completely fill a large search buffer because for large search +buffers, the cost of creating author invisibility overlays and +inserting text (which slows down with more overlays) dominates. +However, the time required to display the first page of results is +generally more important to the user experience. +--- + emacs/notmuch.el | 13 +++---------- + test/emacs | 10 +++------- + 2 files changed, 6 insertions(+), 17 deletions(-) + +diff --git a/emacs/notmuch.el b/emacs/notmuch.el +index b8d9c44..5a8c957 100644 +--- a/emacs/notmuch.el ++++ b/emacs/notmuch.el +@@ -58,6 +58,7 @@ + (require 'notmuch-hello) + (require 'notmuch-maildir-fcc) + (require 'notmuch-message) ++(require 'notmuch-parser) + + (defcustom notmuch-search-result-format + `(("date" . "%12s ") +@@ -809,13 +810,6 @@ non-authors is found, assume that all of the authors match." + (setq notmuch-search-target-thread "found") + (goto-char beg))))) + +-(defun notmuch-search-show-error (string &rest objects) +- (save-excursion +- (goto-char (point-max)) +- (insert "Error: Unexpected output from notmuch search:\n") +- (insert (apply #'format string objects)) +- (insert "\n"))) +- + (defun notmuch-search-process-filter (proc string) + "Process and filter the output of \"notmuch search\"" + (let ((results-buf (process-buffer proc)) +@@ -829,8 +823,7 @@ non-authors is found, assume that all of the authors match." + (save-excursion + (goto-char (point-max)) + (insert string)) +- (notmuch-json-parse-partial-list 'notmuch-search-show-result +- 'notmuch-search-show-error ++ (notmuch-sexp-parse-partial-list 'notmuch-search-show-result + results-buf))))) + + (defun notmuch-search-tag-all (&optional tag-changes) +@@ -933,7 +926,7 @@ Other optional parameters are used as follows: + (save-excursion + (let ((proc (notmuch-start-notmuch + "notmuch-search" buffer #'notmuch-search-process-sentinel +- "search" "--format=json" "--format-version=1" ++ "search" "--format=sexp" "--format-version=1" + (if oldest-first + "--sort=oldest-first" + "--sort=newest-first") +diff --git a/test/emacs b/test/emacs +index d38ae8c..7d42abf 100755 +--- a/test/emacs ++++ b/test/emacs +@@ -856,7 +856,7 @@ test_expect_success "Rendering HTML mail with images" \ + test_begin_subtest "Search handles subprocess error exit codes" + cat > notmuch_fail < notmuch_fail <&2 + echo This is another warning >&2 + exit 0 +@@ -903,8 +901,6 @@ test_emacs "(let ((notmuch-command \"$PWD/notmuch_fail\")) + (test-output))" + sed -i -e 's/^\[.*\]$/[XXX]/' ERROR + test_expect_equal "$(cat OUTPUT; echo ---; cat MESSAGES; echo ---; cat ERROR)" "\ +-Error: Unexpected output from notmuch search: +-This is output + End of search results. + --- + This is a warning (see *Notmuch errors* for more details) +-- +1.7.10.4 + -- 2.26.2