From: Austin Clements Date: Fri, 24 Feb 2012 23:39:44 +0000 (+1900) Subject: Re: [RFC PATCH v5 05/11] lib: Make notmuch_query_search_messages set the exclude... X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=0a88b2504308717376cefd935f5f202941046df0;p=notmuch-archives.git Re: [RFC PATCH v5 05/11] lib: Make notmuch_query_search_messages set the exclude flag --- diff --git a/ae/20c38db3742acbb8cd20a841008380def598d9 b/ae/20c38db3742acbb8cd20a841008380def598d9 new file mode 100644 index 000000000..80faf947f --- /dev/null +++ b/ae/20c38db3742acbb8cd20a841008380def598d9 @@ -0,0 +1,244 @@ +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 7C67D414796 + for ; Fri, 24 Feb 2012 15:39:48 -0800 (PST) +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 P+ty2JFQ1it4 for ; + Fri, 24 Feb 2012 15:39:47 -0800 (PST) +Received: from dmz-mailsec-scanner-3.mit.edu (DMZ-MAILSEC-SCANNER-3.MIT.EDU + [18.9.25.14]) + by olra.theworths.org (Postfix) with ESMTP id 9798541638B + for ; Fri, 24 Feb 2012 15:39:47 -0800 (PST) +X-AuditID: 1209190e-b7f7c6d0000008c3-59-4f481fc2576d +Received: from mailhub-auth-2.mit.edu ( [18.7.62.36]) + by dmz-mailsec-scanner-3.mit.edu (Symantec Messaging Gateway) with SMTP + id 54.FF.02243.2CF184F4; Fri, 24 Feb 2012 18:39:46 -0500 (EST) +Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103]) + by mailhub-auth-2.mit.edu (8.13.8/8.9.2) with ESMTP id q1ONdjZG001590; + Fri, 24 Feb 2012 18:39:46 -0500 +Received: from awakening.csail.mit.edu (awakening.csail.mit.edu [18.26.4.91]) + (authenticated bits=0) + (User authenticated as amdragon@ATHENA.MIT.EDU) + by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id q1ONdik0025799 + (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT); + Fri, 24 Feb 2012 18:39:45 -0500 (EST) +Received: from amthrax by awakening.csail.mit.edu with local (Exim 4.77) + (envelope-from ) + id 1S14jo-0000hh-4O; Fri, 24 Feb 2012 18:39:44 -0500 +Date: Fri, 24 Feb 2012 18:39:44 -0500 +From: Austin Clements +To: Mark Walters +Subject: Re: [RFC PATCH v5 05/11] lib: Make notmuch_query_search_messages set + the exclude flag +Message-ID: <20120224233944.GG30513@mit.edu> +References: <1329296619-7463-1-git-send-email-markwalters1009@gmail.com> + <1329296619-7463-6-git-send-email-markwalters1009@gmail.com> +MIME-Version: 1.0 +Content-Type: text/plain; charset=us-ascii +Content-Disposition: inline +In-Reply-To: <1329296619-7463-6-git-send-email-markwalters1009@gmail.com> +User-Agent: Mutt/1.5.21 (2010-09-15) +X-Brightmail-Tracker: + H4sIAAAAAAAAA+NgFupjleLIzCtJLcpLzFFi42IRYrdT0T0k7+FvcGe3lMXquTwW12/OZHZg + 8tg56y67x7NVt5gDmKK4bFJSczLLUov07RK4MqYce8hUsFavYtK2FrYGxibVLkZODgkBE4nf + q1uZIWwxiQv31rOB2EIC+xglNm5S7GLkArI3MErM7D/EDuGcZJLoXn0MylnCKHHw+RewFhYB + VYkLXctYQGw2AQ2JbfuXM4LYIgI6ErcPLWAHsZkFpCW+/W5mArGFBRIkzpyZCWbzAtUsmPyf + FWJoO6NE46mzbBAJQYmTM5+wQDRrSdz49xKogQNs0PJ/HCAmp4CnRP/0EJAKUQEViSknt7FN + YBSahaR5FpLmWQjNCxiZVzHKpuRW6eYmZuYUpybrFicn5uWlFuka6+VmluilppRuYgQFNack + 3w7GrweVDjEKcDAq8fAyb3H3F2JNLCuuzD3EKMnBpCTKay7r4S/El5SfUpmRWJwRX1Sak1p8 + iFGCg1lJhNeODSjHm5JYWZValA+TkuZgURLnVdN65yckkJ5YkpqdmlqQWgSTleHgUJLgfSkH + 1ChYlJqeWpGWmVOCkGbi4AQZzgM0/D9IDW9xQWJucWY6RP4Uoy7H2sWbLzIKseTl56VKifP+ + BSkSACnKKM2DmwNLRq8YxYHeEua9AFLFA0xkcJNeAS1hAlpi/9cVZElJIkJKqoFxzZVvUlvm + Szs7+s+vPWdy5/b5lscuScHJ/8q3pcrPkX/damg9341nUupti1v6k7z+zDu/tz48mfnZ4UXW + Px6Yr/uqe/HinOPTjXiu8gbbHhM4ee6o+S5VlolceRXF7/+fr+o+s+bDiWXx93/PFzirxad4 + KHr2dvnbriszuFOF/fhfrJiyREpuqxJLcUaioRZzUXEiAAqBQeohAwAA +Cc: notmuch@notmuchmail.org +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: Fri, 24 Feb 2012 23:39:48 -0000 + +Quoth Mark Walters on Feb 15 at 9:03 am: +> Add a flag NOTMUCH_MESSAGE_FLAG_EXCLUDED which is set by +> notmuch_query_search_messages for excluded messages. Also add an +> option omit_excluded_messages to the search that we do not want the +> excludes at all. +> +> This exclude flag will be added to notmuch_query_search threads in the +> next patch. +> --- +> lib/notmuch-private.h | 1 + +> lib/notmuch.h | 10 ++++++++- +> lib/query.cc | 52 +++++++++++++++++++++++++++++++++++++++++++++--- +> 3 files changed, 58 insertions(+), 5 deletions(-) +> +> diff --git a/lib/notmuch-private.h b/lib/notmuch-private.h +> index 7bf153e..e791bb0 100644 +> --- a/lib/notmuch-private.h +> +++ b/lib/notmuch-private.h +> @@ -401,6 +401,7 @@ typedef struct _notmuch_message_list { +> */ +> struct visible _notmuch_messages { +> notmuch_bool_t is_of_list_type; +> + notmuch_doc_id_set_t *excluded_doc_ids; +> notmuch_message_node_t *iterator; +> }; +> +> diff --git a/lib/notmuch.h b/lib/notmuch.h +> index 7929fe7..f75afae 100644 +> --- a/lib/notmuch.h +> +++ b/lib/notmuch.h +> @@ -449,6 +449,13 @@ typedef enum { +> const char * +> notmuch_query_get_query_string (notmuch_query_t *query); +> +> +/* Specify whether to results should omit the excluded results rather +> + * than just marking them excluded. This is useful for passing a +> + * notmuch_messages_t not containing the excluded messages to other +> + * functions. */ +> +void +> +notmuch_query_set_omit_excluded_messages (notmuch_query_t *query, notmuch_bool_t omit); +> + +> /* Specify the sorting desired for this query. */ +> void +> notmuch_query_set_sort (notmuch_query_t *query, notmuch_sort_t sort); +> @@ -895,7 +902,8 @@ notmuch_message_get_filenames (notmuch_message_t *message); +> +> /* Message flags */ +> typedef enum _notmuch_message_flag { +> - NOTMUCH_MESSAGE_FLAG_MATCH +> + NOTMUCH_MESSAGE_FLAG_MATCH, +> + NOTMUCH_MESSAGE_FLAG_EXCLUDED +> } notmuch_message_flag_t; +> +> /* Get a value of a flag for the email corresponding to 'message'. */ +> diff --git a/lib/query.cc b/lib/query.cc +> index c25b301..90a71a1 100644 +> --- a/lib/query.cc +> +++ b/lib/query.cc +> @@ -28,6 +28,7 @@ struct _notmuch_query { +> const char *query_string; +> notmuch_sort_t sort; +> notmuch_string_list_t *exclude_terms; +> + notmuch_bool_t omit_excluded_messages; +> }; +> +> typedef struct _notmuch_mset_messages { +> @@ -57,6 +58,12 @@ struct visible _notmuch_threads { +> notmuch_doc_id_set_t match_set; +> }; +> +> +/* We need this in the message functions so forward declare. */ +> +static notmuch_bool_t +> +_notmuch_doc_id_set_init (void *ctx, +> + notmuch_doc_id_set_t *doc_ids, +> + GArray *arr); +> + +> notmuch_query_t * +> notmuch_query_create (notmuch_database_t *notmuch, +> const char *query_string) +> @@ -79,6 +86,8 @@ notmuch_query_create (notmuch_database_t *notmuch, +> +> query->exclude_terms = _notmuch_string_list_create (query); +> +> + query->omit_excluded_messages = FALSE; +> + +> return query; +> } +> +> @@ -89,6 +98,12 @@ notmuch_query_get_query_string (notmuch_query_t *query) +> } +> +> void +> +notmuch_query_set_omit_excluded_messages (notmuch_query_t *query, notmuch_bool_t omit) +> +{ +> + query->omit_excluded_messages = omit; +> +} +> + +> +void +> notmuch_query_set_sort (notmuch_query_t *query, notmuch_sort_t sort) +> { +> query->sort = sort; +> @@ -173,6 +188,7 @@ notmuch_query_search_messages (notmuch_query_t *query) +> "mail")); +> Xapian::Query string_query, final_query, exclude_query; +> Xapian::MSet mset; +> + Xapian::MSetIterator iterator; +> unsigned int flags = (Xapian::QueryParser::FLAG_BOOLEAN | +> Xapian::QueryParser::FLAG_PHRASE | +> Xapian::QueryParser::FLAG_LOVEHATE | +> @@ -190,11 +206,35 @@ notmuch_query_search_messages (notmuch_query_t *query) +> final_query = Xapian::Query (Xapian::Query::OP_AND, +> mail_query, string_query); +> } +> + messages->base.excluded_doc_ids = NULL; +> + +> + if (query->exclude_terms) { +> + exclude_query = _notmuch_exclude_tags (query, final_query); +> + exclude_query = Xapian::Query (Xapian::Query::OP_AND, +> + exclude_query, final_query); +> + +> + if (query->omit_excluded_messages) +> + final_query = Xapian::Query (Xapian::Query::OP_AND_NOT, +> + final_query, exclude_query); +> + else { +> + enquire.set_weighting_scheme (Xapian::BoolWeight()); +> + enquire.set_query (exclude_query); +> + +> + mset = enquire.get_mset (0, notmuch->xapian_db->get_doccount ()); +> + +> + GArray *excluded_doc_ids = g_array_new (FALSE, FALSE, sizeof (unsigned int)); +> + +> + for (iterator = mset.begin (); iterator != mset.end (); iterator++) { +> + unsigned int doc_id = *iterator; +> + g_array_append_val (excluded_doc_ids, doc_id); +> + } +> + messages->base.excluded_doc_ids = talloc (query, _notmuch_doc_id_set); + +Should this have 'messages' as its talloc context? + +> + _notmuch_doc_id_set_init (query, messages->base.excluded_doc_ids, +> + excluded_doc_ids); +> + g_array_unref (excluded_doc_ids); +> + } +> + } +> +> - exclude_query = _notmuch_exclude_tags (query, final_query); +> - +> - final_query = Xapian::Query (Xapian::Query::OP_AND_NOT, +> - final_query, exclude_query); +> +> enquire.set_weighting_scheme (Xapian::BoolWeight()); +> +> @@ -283,6 +323,10 @@ _notmuch_mset_messages_get (notmuch_messages_t *messages) +> INTERNAL_ERROR ("a messages iterator contains a non-existent document ID.\n"); +> } +> +> + if (messages->excluded_doc_ids && +> + _notmuch_doc_id_set_contains (messages->excluded_doc_ids, doc_id)) +> + notmuch_message_set_flag (message, NOTMUCH_MESSAGE_FLAG_EXCLUDED, TRUE); +> + + +This, at least, is pleasingly simple! + +> return message; +> } +>