From: Mark Walters Date: Thu, 2 Feb 2012 17:43:32 +0000 (+0000) Subject: [PATCH v4 04/11] lib: Rearrange the exclude code in query.cc X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=462aa652719c8116de6e37b3c8eba611fb109a26;p=notmuch-archives.git [PATCH v4 04/11] lib: Rearrange the exclude code in query.cc --- diff --git a/f9/cf25c7d9f62c24306fb3503e9c37e45b388637 b/f9/cf25c7d9f62c24306fb3503e9c37e45b388637 new file mode 100644 index 000000000..42ce871fc --- /dev/null +++ b/f9/cf25c7d9f62c24306fb3503e9c37e45b388637 @@ -0,0 +1,148 @@ +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 47E1C431FD7 + for ; Thu, 2 Feb 2012 09:43:06 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 0.201 +X-Spam-Level: +X-Spam-Status: No, score=0.201 tagged_above=-999 required=5 + tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, + FREEMAIL_ENVFROM_END_DIGIT=1, FREEMAIL_FROM=0.001, + 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 gND7mW7nKRxt for ; + Thu, 2 Feb 2012 09:43:04 -0800 (PST) +Received: from mail-we0-f181.google.com (mail-we0-f181.google.com + [74.125.82.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id CE30F431FD4 + for ; Thu, 2 Feb 2012 09:43:01 -0800 (PST) +Received: by mail-we0-f181.google.com with SMTP id b10so2324200wer.26 + for ; Thu, 02 Feb 2012 09:43:01 -0800 (PST) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; + h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; + bh=IqeCmc2ELfjZkxjYdYxRGHL3vbcGmotc+462IZgK1tU=; + b=lZ5lpwIecXi3SDlQKlKu7TueNFtaHnjG7zQ3gAziwvzbiv2ctSp5Vv3j/5MZAenRg8 + KFQM90G367bYOuFejb6SFZ1vMdpno/4Teubl2i4O6PZdTdckSU+rIoIDSDN1PkqJmPAu + Uk2gaZAb/y/XWL5YsRlah20DerxaIIkUr59qA= +Received: by 10.216.131.215 with SMTP id m65mr1498378wei.54.1328204581497; + Thu, 02 Feb 2012 09:43:01 -0800 (PST) +Received: from localhost (94-192-233-223.zone6.bethere.co.uk. + [94.192.233.223]) by mx.google.com with ESMTPS id + n5sm9123092wiw.7.2012.02.02.09.42.59 (version=TLSv1/SSLv3 cipher=OTHER); Thu, + 02 Feb 2012 09:43:00 -0800 (PST) +From: Mark Walters +To: notmuch@notmuchmail.org, + amdragon@MIT.EDU +Subject: [PATCH v4 04/11] lib: Rearrange the exclude code in query.cc +Date: Thu, 2 Feb 2012 17:43:32 +0000 +Message-Id: <1328204619-25046-4-git-send-email-markwalters1009@gmail.com> +X-Mailer: git-send-email 1.7.2.3 +In-Reply-To: <874nv9rv79.fsf@qmul.ac.uk> +References: <874nv9rv79.fsf@qmul.ac.uk> +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: Thu, 02 Feb 2012 17:43:06 -0000 + +Slightly refactor the exclude code to give the callers access to the +exclude query itself. There should be no functional change. +--- + lib/query.cc | 29 +++++++++++++++++++---------- + 1 files changed, 19 insertions(+), 10 deletions(-) + +diff --git a/lib/query.cc b/lib/query.cc +index 0b36602..c25b301 100644 +--- a/lib/query.cc ++++ b/lib/query.cc +@@ -122,12 +122,15 @@ _notmuch_messages_destructor (notmuch_mset_messages_t *messages) + return 0; + } + +-/* Return a query that does not match messages with the excluded tags +- * registered with the query. Any tags that explicitly appear in +- * xquery will not be excluded. */ ++/* Return a query that matches messages with the excluded tags ++ * registered with query. Any tags that explicitly appear in xquery ++ * will not be excluded. The caller of this function has to combine ++ * the returned query appropriately.*/ + static Xapian::Query + _notmuch_exclude_tags (notmuch_query_t *query, Xapian::Query xquery) + { ++ Xapian::Query exclude_query = Xapian::Query::MatchNothing; ++ + for (notmuch_string_node_t *term = query->exclude_terms->head; term; + term = term->next) { + Xapian::TermIterator it = xquery.get_terms_begin (); +@@ -137,10 +140,10 @@ _notmuch_exclude_tags (notmuch_query_t *query, Xapian::Query xquery) + break; + } + if (it == end) +- xquery = Xapian::Query (Xapian::Query::OP_AND_NOT, +- xquery, Xapian::Query (term->string)); ++ exclude_query = Xapian::Query (Xapian::Query::OP_OR, ++ exclude_query, Xapian::Query (term->string)); + } +- return xquery; ++ return exclude_query; + } + + notmuch_messages_t * +@@ -168,7 +171,7 @@ notmuch_query_search_messages (notmuch_query_t *query) + Xapian::Query mail_query (talloc_asprintf (query, "%s%s", + _find_prefix ("type"), + "mail")); +- Xapian::Query string_query, final_query; ++ Xapian::Query string_query, final_query, exclude_query; + Xapian::MSet mset; + unsigned int flags = (Xapian::QueryParser::FLAG_BOOLEAN | + Xapian::QueryParser::FLAG_PHRASE | +@@ -188,7 +191,10 @@ notmuch_query_search_messages (notmuch_query_t *query) + mail_query, string_query); + } + +- final_query = _notmuch_exclude_tags (query, final_query); ++ 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()); + +@@ -449,7 +455,7 @@ notmuch_query_count_messages (notmuch_query_t *query) + Xapian::Query mail_query (talloc_asprintf (query, "%s%s", + _find_prefix ("type"), + "mail")); +- Xapian::Query string_query, final_query; ++ Xapian::Query string_query, final_query, exclude_query; + Xapian::MSet mset; + unsigned int flags = (Xapian::QueryParser::FLAG_BOOLEAN | + Xapian::QueryParser::FLAG_PHRASE | +@@ -469,7 +475,10 @@ notmuch_query_count_messages (notmuch_query_t *query) + mail_query, string_query); + } + +- final_query = _notmuch_exclude_tags (query, final_query); ++ 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()); + enquire.set_docid_order(Xapian::Enquire::ASCENDING); +-- +1.7.2.3 +