From: Mark Walters Date: Sat, 25 Feb 2012 08:06:35 +0000 (+0000) Subject: [Patch v6 04/13] lib: Rearrange the exclude code in query.cc X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=305c2c9265abbff30e970c2ea5450b7464b84552;p=notmuch-archives.git [Patch v6 04/13] lib: Rearrange the exclude code in query.cc --- diff --git a/79/3c923ca0fee13aa5710d890cca04b309e2e1a4 b/79/3c923ca0fee13aa5710d890cca04b309e2e1a4 new file mode 100644 index 000000000..238180593 --- /dev/null +++ b/79/3c923ca0fee13aa5710d890cca04b309e2e1a4 @@ -0,0 +1,157 @@ +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 831DD431FBF + for ; Sat, 25 Feb 2012 19:14:36 -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 hyzUyJGqp11R for ; + Sat, 25 Feb 2012 19:14:35 -0800 (PST) +Received: from mail-ww0-f45.google.com (mail-ww0-f45.google.com + [74.125.82.45]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client + certificate requested) by olra.theworths.org (Postfix) with ESMTPS id + AEF3A431FAE for ; Sat, 25 Feb 2012 19:14:35 -0800 + (PST) +Received: by wgbdt12 with SMTP id dt12so2784835wgb.2 + for ; Sat, 25 Feb 2012 19:14:34 -0800 (PST) +Received-SPF: pass (google.com: domain of markwalters1009@gmail.com designates + 10.180.92.71 as permitted sender) client-ip=10.180.92.71; +Authentication-Results: mr.google.com; spf=pass (google.com: domain of + markwalters1009@gmail.com designates 10.180.92.71 as permitted + sender) smtp.mail=markwalters1009@gmail.com; + dkim=pass header.i=markwalters1009@gmail.com +Received: from mr.google.com ([10.180.92.71]) + by 10.180.92.71 with SMTP id ck7mr21015935wib.3.1330226074546 (num_hops + = 1); Sat, 25 Feb 2012 19:14:34 -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=D75LpKiQC8n/O+GzFLoE1jhz2zc6a8ddD6HpSNofU/x4IhqAOC53dkNzsFWZUMq3pN + OoECp9BWTdZU+JHVUziTY0eOYVINIHMq8SLILPhbajVoDz7F0iVaYWQGijFrhst90tpn + moxMApACeNm0FeJx238zdSZpC0C18CpINWtvw= +Received: by 10.180.92.71 with SMTP id ck7mr11461242wib.3.1330157134460; + Sat, 25 Feb 2012 00:05:34 -0800 (PST) +Received: from localhost (94-192-233-223.zone6.bethere.co.uk. + [94.192.233.223]) by mx.google.com with ESMTPS id + df3sm8234444wib.1.2012.02.25.00.05.33 (version=TLSv1/SSLv3 cipher=OTHER); + Sat, 25 Feb 2012 00:05:33 -0800 (PST) +From: Mark Walters +To: notmuch@notmuchmail.org, + Austin Clements +Subject: [Patch v6 04/13] lib: Rearrange the exclude code in query.cc +Date: Sat, 25 Feb 2012 08:06:35 +0000 +Message-Id: <1330157204-26094-5-git-send-email-markwalters1009@gmail.com> +X-Mailer: git-send-email 1.7.2.3 +In-Reply-To: <1330157204-26094-1-git-send-email-markwalters1009@gmail.com> +References: <1330157204-26094-1-git-send-email-markwalters1009@gmail.com> +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: Sun, 26 Feb 2012 03:14:36 -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 +