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 2onCEfJVFWEyOQEAgWs5BA (envelope-from ) for ; Thu, 12 Aug 2021 19:10:10 +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 oOTNDPJVFWEgVwAAB5/wlQ (envelope-from ) for ; Thu, 12 Aug 2021 17:10:10 +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) server-digest SHA256) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id B5337BC9F for ; Thu, 12 Aug 2021 19:10:09 +0200 (CEST) Received: from nmbug.tethera.net (localhost [127.0.0.1]) by mail.notmuchmail.org (Postfix) with ESMTP id 2DC092C01D; Thu, 12 Aug 2021 13:09:19 -0400 (EDT) Received: from fethera.tethera.net (fethera.tethera.net [IPv6:2607:5300:60:c5::1]) by mail.notmuchmail.org (Postfix) with ESMTP id 51F4D2C00B for ; Thu, 12 Aug 2021 13:09:11 -0400 (EDT) Received: by fethera.tethera.net (Postfix, from userid 1001) id 4A4FB5FD5C; Thu, 12 Aug 2021 13:09:11 -0400 (EDT) Received: (nullmailer pid 1348771 invoked by uid 1000); Thu, 12 Aug 2021 17:07:43 -0000 From: David Bremner To: notmuch@notmuchmail.org Cc: David Bremner Subject: [PATCH 24/31] lib/parse-sexp: support infix subqueries Date: Thu, 12 Aug 2021 10:07:21 -0700 Message-Id: <20210812170728.1348333-25-david@tethera.net> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210812170728.1348333-1-david@tethera.net> References: <20210812170728.1348333-1-david@tethera.net> MIME-Version: 1.0 Message-ID-Hash: G222MXBCUU37VGI5HFNGXUYHWMKWRMCO X-Message-ID-Hash: G222MXBCUU37VGI5HFNGXUYHWMKWRMCO 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=1628788209; 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=GO3H2yPStzP5zsV2/8ZrPYw88FPd+/j4E1IOA3aIrtU=; b=YFpUz9fLqexgjrSVoLstiMQzrYixBtrkduqsx7PP7/PT8rZBqzovcPG40QIuZjIzAAYQRf totmLpJPGysSHT4OVgWYt5BDQ+4xm+vhAdhA7qv/oxSIQLnSwUWBMsbYboeYDtsojmIBSh uHgOupdAenSTJP4rhsW6K22ZA8wSeW3oh9qWFiK6hPSPpTuQSwjQb9zMA8bmjv5+WVFiIx SJ+yv8PQY6Rx2NbcNAr1ko15pKZj25f5qsZIBemEw6Sx7ist+FjLCqCEs9t4HlAhogiEHl zRtg9xghveNZPpryjB6Sh3bxGt1smthphSnPLj0i4qLNNnN42m7Xsyn2L+KMDQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1628788209; a=rsa-sha256; cv=none; b=WG9GdoUzVKIDaqgLQXMQZTFz90uI+Cp55kQCZoOqeNvkXgItDqRKV/1tT4vzn//dENwgID Bt2sxCUKKNfCd3Hdlibsu+oEVlTZerYhTerjtkCNafIezXumOQj30K35mESzIYiHTqfl5B JCHSBS6meKMHgOSCcK+OWZM+7Z624OBIUiaLtsIr2+QvomLeoJvBMqZ8Yx8s1TccbxXbtk Dx8l6KkFjLQggdgBK8MMKLLMIbBRfXsPjyxMQYPZv+T0R20VlZpJaQEYrr8BwCD0YhoUJb 5ItQgZAvL+0Ew0xbVqKGgWrNJIZIceafoASHhMNhxxCeU0tTAzfYTqBdlNFhkA== 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: 0.56 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: B5337BC9F X-Spam-Score: 0.56 X-Migadu-Scanner: scn0.migadu.com X-TUID: KngA65LvStE4 This is necessary so that programs can take infix syntax queries from a user and use the sexp query syntax to construct e.g. a refinement of that query. --- doc/man7/notmuch-sexp-queries.rst | 7 +++++ lib/parse-sexp.cc | 34 ++++++++++++++++++++++++ test/T081-sexpr-search.sh | 43 +++++++++++++++++++++++++++++++ 3 files changed, 84 insertions(+) diff --git a/doc/man7/notmuch-sexp-queries.rst b/doc/man7/notmuch-sexp-queries.rst index 52624954..1c80b26a 100644 --- a/doc/man7/notmuch-sexp-queries.rst +++ b/doc/man7/notmuch-sexp-queries.rst @@ -144,6 +144,10 @@ MODIFIERS *Modifiers* refer to any prefixes (first elements of compound queries) that are neither operators nor fields. +``(infix`` *atom* ``)`` + Interpret *atom* as an infix notmuch query (see + :any:`notmuch-search-terms(7)`). Not supported inside fields. + ``(matching`` |q1| |q2| ... |qn| ``)`` ``(of`` |q1| |q2| ... |qn| ``)`` Match all messages have the same values of the current field as those matching all of |q1| ... |qn|. Supported in most term [#not-path]_ or @@ -187,6 +191,9 @@ EXAMPLES ``(id 1234@invalid blah@test)`` Matches Message-Id "1234@invalid" *or* Message-Id "blah@test" +``(and (infix "date:2009-11-18..2009-11-18") (tag unread))`` + Match messages in the given date range with tag unread. + ``(starts-with prelim)`` Match any words starting with "prelim". diff --git a/lib/parse-sexp.cc b/lib/parse-sexp.cc index 3c99a7e0..61dd8f7d 100644 --- a/lib/parse-sexp.cc +++ b/lib/parse-sexp.cc @@ -57,6 +57,8 @@ static _sexp_prefix_t prefixes[] = SEXP_FLAG_FIELD | SEXP_FLAG_BOOLEAN | SEXP_FLAG_WILDCARD | SEXP_FLAG_REGEX | SEXP_FLAG_EXPAND }, { "id", Xapian::Query::OP_OR, Xapian::Query::MatchNothing, SEXP_FLAG_FIELD | SEXP_FLAG_BOOLEAN | SEXP_FLAG_WILDCARD | SEXP_FLAG_REGEX }, + { "infix", Xapian::Query::OP_INVALID, Xapian::Query::MatchAll, + SEXP_FLAG_SINGLE }, { "is", Xapian::Query::OP_AND, Xapian::Query::MatchAll, SEXP_FLAG_FIELD | SEXP_FLAG_BOOLEAN | SEXP_FLAG_WILDCARD | SEXP_FLAG_REGEX | SEXP_FLAG_EXPAND }, { "matching", Xapian::Query::OP_AND, Xapian::Query::MatchAll, @@ -242,6 +244,34 @@ _sexp_expand_query (notmuch_database_t *notmuch, return status; } +static notmuch_status_t +_sexp_parse_infix (notmuch_database_t *notmuch, const _sexp_prefix_t *parent, + const sexp_t *sx, Xapian::Query &output) +{ + if (parent) { + _notmuch_database_log (notmuch, "'infix' not supported inside '%s'\n", parent->name); + return NOTMUCH_STATUS_BAD_QUERY_SYNTAX; + } + try { + output = notmuch->query_parser->parse_query (sx->val, NOTMUCH_QUERY_PARSER_FLAGS); + } catch (const Xapian::QueryParserError &error) { + _notmuch_database_log (notmuch, "Syntax error in infix query: %s\n", sx->val); + return NOTMUCH_STATUS_BAD_QUERY_SYNTAX; + } catch (const Xapian::Error &error) { + if (! notmuch->exception_reported) { + _notmuch_database_log (notmuch, + "A Xapian exception occurred parsing query: %s\n", + error.get_msg ().c_str ()); + _notmuch_database_log_append (notmuch, + "Query string was: %s\n", + sx->val); + notmuch->exception_reported = true; + return NOTMUCH_STATUS_XAPIAN_EXCEPTION; + } + } + return NOTMUCH_STATUS_SUCCESS; +} + /* Here we expect the s-expression to be a proper list, with first * element defining and operation, or as a special case the empty * list */ @@ -311,6 +341,10 @@ _sexp_to_xapian_query (notmuch_database_t *notmuch, const _sexp_prefix_t *parent return NOTMUCH_STATUS_BAD_QUERY_SYNTAX; } + if (strcmp (prefix->name, "infix") == 0) { + return _sexp_parse_infix (notmuch, parent, sx->list->next, output); + } + if (prefix->xapian_op == Xapian::Query::OP_WILDCARD) return _sexp_parse_wildcard (notmuch, parent, sx->list->next->val, output); diff --git a/test/T081-sexpr-search.sh b/test/T081-sexpr-search.sh index 453cce29..bd57282d 100755 --- a/test/T081-sexpr-search.sh +++ b/test/T081-sexpr-search.sh @@ -689,4 +689,47 @@ id:cf0c4d610911171136h1713aa59w9cf9aa31f052ad0a@mail.gmail.com EOF test_expect_equal_file EXPECTED OUTPUT +test_begin_subtest "infix query" +notmuch search to:searchbyto | notmuch_search_sanitize > EXPECTED +notmuch search --query=sexp '(infix "to:searchbyto")' | notmuch_search_sanitize > OUTPUT +test_expect_equal_file EXPECTED OUTPUT + +test_begin_subtest "bad infix query 1" +notmuch search --query=sexp '(infix "from:/unbalanced")' 2>&1| notmuch_search_sanitize > OUTPUT +cat < EXPECTED +notmuch search: Syntax error in query +Syntax error in infix query: from:/unbalanced +EOF +test_expect_equal_file EXPECTED OUTPUT + +test_begin_subtest "bad infix query 2" +notmuch search --query=sexp '(infix "thread:{unbalanced")' 2>&1| notmuch_search_sanitize > OUTPUT +cat < EXPECTED +notmuch search: Syntax error in query +Syntax error in infix query: thread:{unbalanced +EOF +test_expect_equal_file EXPECTED OUTPUT + +test_begin_subtest "bad infix query 3: bad nesting" +notmuch search --query=sexp '(subject (infix "tag:inbox"))' 2>&1| notmuch_search_sanitize > OUTPUT +cat < EXPECTED +notmuch search: Syntax error in query +'infix' not supported inside 'subject' +EOF +test_expect_equal_file EXPECTED OUTPUT + +test_begin_subtest "infix query that matches no messages" +notmuch search --query=sexp '(and (infix "from:keithp") (infix "to:keithp"))' > OUTPUT +test_expect_equal_file /dev/null OUTPUT + +test_begin_subtest "compound infix query" +notmuch search date:2009-11-18..2009-11-18 and tag:unread > EXPECTED +notmuch search --query=sexp '(infix "date:2009-11-18..2009-11-18 and tag:unread")' > OUTPUT +test_expect_equal_file EXPECTED OUTPUT + +test_begin_subtest "compound infix query 2" +notmuch search date:2009-11-18..2009-11-18 and tag:unread > EXPECTED +notmuch search --query=sexp '(and (infix "date:2009-11-18..2009-11-18") (infix "tag:unread"))' > OUTPUT +test_expect_equal_file EXPECTED OUTPUT + test_done -- 2.30.2