From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id D6WmD/mU82AEGAAAgWs5BA (envelope-from ) for ; Sun, 18 Jul 2021 04:42:01 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id aF/OCvmU82A1GgAAB5/wlQ (envelope-from ) for ; Sun, 18 Jul 2021 02:42:01 +0000 Received: from mail.notmuchmail.org (nmbug.tethera.net [IPv6:2607:5300:201:3100::1657]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id B71E922983 for ; Sun, 18 Jul 2021 04:42:00 +0200 (CEST) Received: from nmbug.tethera.net (localhost [127.0.0.1]) by mail.notmuchmail.org (Postfix) with ESMTP id C82D229C5E; Sat, 17 Jul 2021 22:41:20 -0400 (EDT) Received: from fethera.tethera.net (fethera.tethera.net [198.245.60.197]) by mail.notmuchmail.org (Postfix) with ESMTP id 7B26D2931B for ; Sat, 17 Jul 2021 22:40:46 -0400 (EDT) Received: by fethera.tethera.net (Postfix, from userid 1001) id 2D52C5FD21; Sat, 17 Jul 2021 22:40:46 -0400 (EDT) Received: (nullmailer pid 3853961 invoked by uid 1000); Sun, 18 Jul 2021 02:40:27 -0000 From: David Bremner To: notmuch@notmuchmail.org Cc: David Bremner Subject: [PATCH 20/25] lib/thread-fp: factor out query expansion Date: Sat, 17 Jul 2021 23:40:16 -0300 Message-Id: <20210718024021.3850340-21-david@tethera.net> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210718024021.3850340-1-david@tethera.net> References: <20210718024021.3850340-1-david@tethera.net> MIME-Version: 1.0 Message-ID-Hash: 4XXZEWX3S4FL24R7SKBC7V5T2T4YCBO6 X-Message-ID-Hash: 4XXZEWX3S4FL24R7SKBC7V5T2T4YCBO6 X-MailFrom: bremner@tethera.net X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-notmuch.notmuchmail.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.1 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Help: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1626576121; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=T2pNn+0FMSBciRcVjw2yhlfCMWpYU/51IC43nFTxgi4=; b=aOQDTQSDsiV8l4DQdDPriOyOjxQU3vlvtsbZw+bhksOdY6mgF/ePYfabkApnvxL5yW/OhR 4F0Kqwc2XPzQM1Jm+vb8/ytl2b5/tsu/jTV7D/tWeGHoOZKMHr/x0tMhFGzlLlpcpDMn7g DRFNseikKWXBnMLj9MLOWSrU0XHrJgG223KH1sNGpoIorcXn++HWYSalrW9mBPvKe1upJi LR9L0oMftx2vA43srlNGI0LN/6NNjeibrg5BSMh/G528QfzwN240Nxj4l2gE9LbGo9E2AV 7DF/IVxhijd4Cb8DtMFR0io1gwpmpAR2i0oyDeCAu9ZrFrsK7LJNZWwcDOhSaQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1626576121; a=rsa-sha256; cv=none; b=S5Mp9HQOW86vBm2dN5FEmn0fCCQk9hgwYNMut8NFC5U7HKlwK9lab2XBdYpxJC6V4IcTd/ BREw5DgCVuVHQcjAeDwDJWVCV4iJreqkegeOTQiiqGZGrkp2ZRUXvT70P1voqVANppHk51 5SyppC8chX8fOFKHR1+YNBOW5FnRxm6VCpbmpNTGb3Oe78OR0Qv0HLoexZ9IfAjptFVJqG CdY8Hh1FeKZ2hWG8zCX2WVzGmfl4Gi8zqQDFjAJrvBy63GZeyRkJZEE9fKtmfRGBooPP3x gG40jRq/BJpr3eqdz5e6bmCtydMScWrZimCHoqWo+aI6VOqgtZ5pp/b8suzJfA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 2607:5300:201:3100::1657 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Migadu-Spam-Score: -1.05 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 2607:5300:201:3100::1657 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Migadu-Queue-Id: B71E922983 X-Spam-Score: -1.05 X-Migadu-Scanner: scn0.migadu.com X-TUID: lool37uAyW4E The non-obvious choice of creating the query outside the factored-out code is so the the new function can be used with different query syntaxes. --- lib/database-private.h | 5 +++++ lib/query.cc | 26 ++++++++++++++++++++++++++ lib/thread-fp.cc | 25 +++++++++---------------- 3 files changed, 40 insertions(+), 16 deletions(-) diff --git a/lib/database-private.h b/lib/database-private.h index 9706c17e..72b74807 100644 --- a/lib/database-private.h +++ b/lib/database-private.h @@ -300,4 +300,9 @@ _notmuch_database_setup_standard_query_fields (notmuch_database_t *notmuch); notmuch_status_t _notmuch_database_setup_user_query_fields (notmuch_database_t *notmuch); +/* query.cc */ +notmuch_status_t +_notmuch_query_expand_to_threads (notmuch_query_t *subquery, + Xapian::Query &output, std::string &msg); + #endif diff --git a/lib/query.cc b/lib/query.cc index 46bc1373..0916860e 100644 --- a/lib/query.cc +++ b/lib/query.cc @@ -796,3 +796,29 @@ notmuch_query_get_database (const notmuch_query_t *query) { return query->notmuch; } + +notmuch_status_t +_notmuch_query_expand_to_threads (notmuch_query_t *subquery, Xapian::Query &output, std::string &msg) +{ + notmuch_messages_t *messages; + std::set terms; + notmuch_status_t status; + const std::string thread_prefix = _find_prefix ("thread"); + + status = notmuch_query_search_messages (subquery, &messages); + if (status) { + msg = "failed to search messages for subquery"; + return NOTMUCH_STATUS_ILLEGAL_ARGUMENT; + } + + for (; notmuch_messages_valid (messages); notmuch_messages_move_to_next (messages)) { + std::string term = thread_prefix; + notmuch_message_t *message; + message = notmuch_messages_get (messages); + term += _notmuch_message_get_thread_id_only (message); + terms.insert (term); + } + output = Xapian::Query (Xapian::Query::OP_OR, terms.begin (), terms.end ()); + + return NOTMUCH_STATUS_SUCCESS; +} diff --git a/lib/thread-fp.cc b/lib/thread-fp.cc index 06708ef2..d0680a22 100644 --- a/lib/thread-fp.cc +++ b/lib/thread-fp.cc @@ -34,28 +34,21 @@ ThreadFieldProcessor::operator() (const std::string & str) if (str.size () <= 1 || str.at (str.size () - 1) != '}') { throw Xapian::QueryParserError ("missing } in '" + str + "'"); } else { + notmuch_query_t *subquery; + Xapian::Query query; + std::string msg; std::string subquery_str = str.substr (1, str.size () - 2); - notmuch_query_t *subquery = notmuch_query_create (notmuch, subquery_str.c_str ()); - notmuch_messages_t *messages; - std::set terms; + subquery = notmuch_query_create (notmuch, subquery_str.c_str ()); if (! subquery) - throw Xapian::QueryParserError ("failed to create subquery for '" + subquery_str + - "'"); + throw Xapian::QueryParserError ("failed to create subquery for '" + + subquery_str + "'"); - status = notmuch_query_search_messages (subquery, &messages); + status = _notmuch_query_expand_to_threads (subquery, query, msg); if (status) - throw Xapian::QueryParserError ("failed to search messages for '" + subquery_str + - "'"); + throw Xapian::QueryParserError (msg); - for (; notmuch_messages_valid (messages); notmuch_messages_move_to_next (messages)) { - std::string term = thread_prefix; - notmuch_message_t *message; - message = notmuch_messages_get (messages); - term += _notmuch_message_get_thread_id_only (message); - terms.insert (term); - } - return Xapian::Query (Xapian::Query::OP_OR, terms.begin (), terms.end ()); + return query; } } else { /* literal thread id */ -- 2.30.2