1 Return-Path: <markwalters1009@gmail.com>
\r
2 X-Original-To: notmuch@notmuchmail.org
\r
3 Delivered-To: notmuch@notmuchmail.org
\r
4 Received: from localhost (localhost [127.0.0.1])
\r
5 by olra.theworths.org (Postfix) with ESMTP id 908B9431FB6
\r
6 for <notmuch@notmuchmail.org>; Fri, 6 Apr 2012 05:49:16 -0700 (PDT)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=0.201 tagged_above=-999 required=5
\r
12 tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,
\r
13 FREEMAIL_ENVFROM_END_DIGIT=1, FREEMAIL_FROM=0.001,
\r
14 RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled
\r
15 Received: from olra.theworths.org ([127.0.0.1])
\r
16 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
17 with ESMTP id s+y4bufLmlYg for <notmuch@notmuchmail.org>;
\r
18 Fri, 6 Apr 2012 05:49:16 -0700 (PDT)
\r
19 Received: from mail-wg0-f45.google.com (mail-wg0-f45.google.com
\r
20 [74.125.82.45]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client
\r
21 certificate requested) by olra.theworths.org (Postfix) with ESMTPS id
\r
22 C042C431FAE for <notmuch@notmuchmail.org>; Fri, 6 Apr 2012 05:49:15 -0700
\r
24 Received: by wgbdt14 with SMTP id dt14so188823wgb.2
\r
25 for <notmuch@notmuchmail.org>; Fri, 06 Apr 2012 05:49:14 -0700 (PDT)
\r
26 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
\r
27 h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references;
\r
28 bh=evWbal5TZwC83T81p5PIhFxgGHmqMjVz7PLu6Fut7js=;
\r
29 b=KS3wkamNhPcWIiqwdAT0rlz0uqX5mF2vb8q4OqnnSsoVHW+ChK3bwEseEHQyMA87C6
\r
30 1bpmG8QmOOiy/PqpN7iuU2vlkkZ9RPRGo224lKI3nJNWfxIznFVQznAeMSQOUsh0pd2m
\r
31 FmjnMzJojeoW+6Zym1xllxYtf6nX2QISSPJWIVzk9XhqJ53M2FMhplxdrvVc4RGJIOGs
\r
32 FTOLrSmruNxVtxu0uz564i1nDj6Nq4zVsli9F/5JzIl3jtYb+WKc7J+QKrD2qlWi04D1
\r
33 BGIvjUC7osRzH17n3MekeUfqe7xdEU9yrwS90BmbhXrgKg2tfRsoMiVG/C2gvy3r13wj
\r
35 Received: by 10.216.136.131 with SMTP id w3mr3963991wei.15.1333716554509;
\r
36 Fri, 06 Apr 2012 05:49:14 -0700 (PDT)
\r
37 Received: from localhost (94-192-233-223.zone6.bethere.co.uk.
\r
38 [94.192.233.223]) by mx.google.com with ESMTPS id
\r
39 j3sm10207675wiw.1.2012.04.06.05.49.12 (version=TLSv1/SSLv3 cipher=OTHER);
\r
40 Fri, 06 Apr 2012 05:49:13 -0700 (PDT)
\r
41 From: Mark Walters <markwalters1009@gmail.com>
\r
42 To: notmuch@notmuchmail.org
\r
43 Subject: [PATCH v3 1/6] lib: change default for
\r
44 notmuch_query_set_omit_excluded
\r
45 Date: Fri, 6 Apr 2012 13:49:06 +0100
\r
46 Message-Id: <1333716551-29153-2-git-send-email-markwalters1009@gmail.com>
\r
47 X-Mailer: git-send-email 1.7.9.1
\r
48 In-Reply-To: <1333716551-29153-1-git-send-email-markwalters1009@gmail.com>
\r
49 References: <1333716551-29153-1-git-send-email-markwalters1009@gmail.com>
\r
50 X-BeenThere: notmuch@notmuchmail.org
\r
51 X-Mailman-Version: 2.1.13
\r
53 List-Id: "Use and development of the notmuch mail system."
\r
54 <notmuch.notmuchmail.org>
\r
55 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
56 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
57 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
58 List-Post: <mailto:notmuch@notmuchmail.org>
\r
59 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
60 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
61 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
62 X-List-Received-Date: Fri, 06 Apr 2012 12:49:16 -0000
\r
65 lib/notmuch.h | 23 ++++++++++++++++++-----
\r
66 lib/query.cc | 10 +++++-----
\r
67 2 files changed, 23 insertions(+), 10 deletions(-)
\r
69 diff --git a/lib/notmuch.h b/lib/notmuch.h
\r
70 index babd208..673c423 100644
\r
73 @@ -449,12 +449,25 @@ typedef enum {
\r
75 notmuch_query_get_query_string (notmuch_query_t *query);
\r
77 -/* Specify whether to results should omit the excluded results rather
\r
78 - * than just marking them excluded. This is useful for passing a
\r
79 - * notmuch_messages_t not containing the excluded messages to other
\r
81 +/* Specify whether to omit excluded results or simply flag them. By
\r
82 + * default, this is set to TRUE.
\r
84 + * If this is TRUE, notmuch_query_search_messages will omit excluded
\r
85 + * messages from the results. notmuch_query_search_threads will omit
\r
86 + * threads that match only in excluded messages, but will include all
\r
87 + * messages in threads that match in at least one non-excluded
\r
90 + * The performance difference when calling
\r
91 + * notmuch_query_search_messages should be relatively small (and both
\r
92 + * should be very fast). However, in some cases,
\r
93 + * notmuch_query_search_threads is very much faster when omitting
\r
94 + * excluded messages as it does not need to construct the threads that
\r
95 + * only match in excluded messages.
\r
99 -notmuch_query_set_omit_excluded_messages (notmuch_query_t *query, notmuch_bool_t omit);
\r
100 +notmuch_query_set_omit_excluded (notmuch_query_t *query, notmuch_bool_t omit_excluded);
\r
102 /* Specify the sorting desired for this query. */
\r
104 diff --git a/lib/query.cc b/lib/query.cc
\r
105 index 68ac1e4..e9c1a2d 100644
\r
108 @@ -28,7 +28,7 @@ struct _notmuch_query {
\r
109 const char *query_string;
\r
110 notmuch_sort_t sort;
\r
111 notmuch_string_list_t *exclude_terms;
\r
112 - notmuch_bool_t omit_excluded_messages;
\r
113 + notmuch_bool_t omit_excluded;
\r
116 typedef struct _notmuch_mset_messages {
\r
117 @@ -92,7 +92,7 @@ notmuch_query_create (notmuch_database_t *notmuch,
\r
119 query->exclude_terms = _notmuch_string_list_create (query);
\r
121 - query->omit_excluded_messages = FALSE;
\r
122 + query->omit_excluded = TRUE;
\r
126 @@ -104,9 +104,9 @@ notmuch_query_get_query_string (notmuch_query_t *query)
\r
130 -notmuch_query_set_omit_excluded_messages (notmuch_query_t *query, notmuch_bool_t omit)
\r
131 +notmuch_query_set_omit_excluded (notmuch_query_t *query, notmuch_bool_t omit_excluded)
\r
133 - query->omit_excluded_messages = omit;
\r
134 + query->omit_excluded = omit_excluded;
\r
138 @@ -220,7 +220,7 @@ notmuch_query_search_messages (notmuch_query_t *query)
\r
139 if (query->exclude_terms) {
\r
140 exclude_query = _notmuch_exclude_tags (query, final_query);
\r
142 - if (query->omit_excluded_messages)
\r
143 + if (query->omit_excluded)
\r
144 final_query = Xapian::Query (Xapian::Query::OP_AND_NOT,
\r
145 final_query, exclude_query);
\r