From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id 4DKwKGdl6WHwVAEAgWs5BA (envelope-from ) for ; Thu, 20 Jan 2022 14:36:39 +0100 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id uMFpIWdl6WE6HAAAG6o9tA (envelope-from ) for ; Thu, 20 Jan 2022 14:36:39 +0100 Received: from mail.notmuchmail.org (yantan.tethera.net [135.181.149.255]) (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 37EAE2D4A6 for ; Thu, 20 Jan 2022 14:36:39 +0100 (CET) Received: from yantan.tethera.net (localhost [127.0.0.1]) by mail.notmuchmail.org (Postfix) with ESMTP id DD66A5F727; Thu, 20 Jan 2022 13:36:18 +0000 (UTC) Received: from fethera.tethera.net (fethera.tethera.net [198.245.60.197]) by mail.notmuchmail.org (Postfix) with ESMTP id BD2A85F710 for ; Thu, 20 Jan 2022 13:36:15 +0000 (UTC) Received: by fethera.tethera.net (Postfix, from userid 1001) id 1D7215FC7B; Thu, 20 Jan 2022 08:36:14 -0500 (EST) Received: (nullmailer pid 31646 invoked by uid 1000); Thu, 20 Jan 2022 13:36:08 -0000 From: David Bremner To: notmuch@notmuchmail.org Subject: [PATCH v2 6/6] lib/parse-sexp: handle lastmod queries. Date: Thu, 20 Jan 2022 09:36:05 -0400 Message-Id: <20220120133605.31401-7-david@tethera.net> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220120133605.31401-1-david@tethera.net> References: <20220120133605.31401-1-david@tethera.net> MIME-Version: 1.0 Message-ID-Hash: HSPAOW3B4WMAK2HW757H5QBQ5SJQEK3Z X-Message-ID-Hash: HSPAOW3B4WMAK2HW757H5QBQ5SJQEK3Z 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; digests; suspicious-header X-Mailman-Version: 3.3.3 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit X-Migadu-Flow: FLOW_IN X-Migadu-Country: DE ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1642685799; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to: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-owner:list-unsubscribe:list-subscribe:list-post; bh=wCkoK152HfVbgll745BHqqmPoaRGedjPQ6HOWKBdPj0=; b=PWeMPWyYAJNtdBK/8Xv6lJqE8mgG1yBtoE4DW3mJKryLaYi6Our56TEoS8d6awjvDKKnAT aBrcOTO1qOKIMqNxjVo+0uomURIvvOqt8WLwjRDxgyYC/nYrgrceEkLTi2+5hfZPhS6etM 9lJZSaGTZEVZjUsQin0JEZYrHKBEqRGGpgqXdt8LJJZO5HYTHk7ho7XikLyowUOJUhTDCH /CYyg5spSdMdlCMEw5JhoZzqB/4SEMIkvdPVuauKFDJfs2QVNMDV/8VQNWvaneQm1xeVkY dTmCvwHX+jOwTLYLjP/qOjSul57ZrJsp68XbpyhRH7j4pTeW7LoHqAKEWQNG2w== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1642685799; a=rsa-sha256; cv=none; b=EI9PANGhwyQFUxmrp0u+mbctPdQXRygp2XxCKdzzuksDKVo7t2IT/B74bXp9wZEhNDmkFA Z76XQA4psOF9M3lTovNLXjVHKvyobVlrz4mqVS/2qezK5AOtSIrEiagb+1ANAtF2eF6zEF wUVZWSb/kS6ZKkb+pM4gmgAYp1Gq5+Y6i119BbgCgTO4z1Q8VaSO97TvlFbq7NVC6u6rGJ n2YqMmi7tZTYo3c053reS7Mtgu84YGzvdE2bBT+0VpGODNQaWywV1dG7PhMc0WPtSxItgp HJqtpuhoB8QGRyCjLPBToRwqWptjtc7R227AYT0E21A5I5tV6xJrtg+f8p/JSQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 135.181.149.255 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Migadu-Spam-Score: -1.85 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 135.181.149.255 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Migadu-Queue-Id: 37EAE2D4A6 X-Spam-Score: -1.85 X-Migadu-Scanner: scn0.migadu.com X-TUID: LZNm/CRmgpDF This particular choice of converting strings to integers requires C++11. --- lib/parse-sexp.cc | 25 +++++++++++++++++++++++++ test/T081-sexpr-search.sh | 10 ---------- 2 files changed, 25 insertions(+), 10 deletions(-) diff --git a/lib/parse-sexp.cc b/lib/parse-sexp.cc index dbc3f89d..06825dc4 100644 --- a/lib/parse-sexp.cc +++ b/lib/parse-sexp.cc @@ -79,6 +79,8 @@ static _sexp_prefix_t prefixes[] = SEXP_FLAG_SINGLE | SEXP_FLAG_ORPHAN }, { "is", Xapian::Query::OP_AND, Xapian::Query::MatchAll, SEXP_FLAG_FIELD | SEXP_FLAG_BOOLEAN | SEXP_FLAG_WILDCARD | SEXP_FLAG_REGEX | SEXP_FLAG_EXPAND }, + { "lastmod", Xapian::Query::OP_INVALID, Xapian::Query::MatchAll, + SEXP_FLAG_RANGE }, { "matching", Xapian::Query::OP_AND, Xapian::Query::MatchAll, SEXP_FLAG_DO_EXPAND }, { "mid", Xapian::Query::OP_OR, Xapian::Query::MatchNothing, @@ -495,6 +497,29 @@ _sexp_parse_range (notmuch_database_t *notmuch, const _sexp_prefix_t *prefix, return status; } + if (strcmp (prefix->name, "lastmod") == 0) { + long from_idx, to_idx; + + try { + from_idx = std::stol (from); + } catch (std::logic_error &e) { + _notmuch_database_log (notmuch, "bad 'from' revision: '%s'\n", from); + return NOTMUCH_STATUS_BAD_QUERY_SYNTAX; + } + + try { + to_idx = std::stol (to); + } catch (std::logic_error &e) { + _notmuch_database_log (notmuch, "bad 'to' revision: '%s'\n", to); + return NOTMUCH_STATUS_BAD_QUERY_SYNTAX; + } + + output = Xapian::Query (Xapian::Query::OP_VALUE_RANGE, NOTMUCH_VALUE_LAST_MOD, + Xapian::sortable_serialise (from_idx), + Xapian::sortable_serialise (to_idx)); + return NOTMUCH_STATUS_SUCCESS; + } + _notmuch_database_log (notmuch, "unimplimented range prefix: '%s'\n", prefix->name); return NOTMUCH_STATUS_BAD_QUERY_SYNTAX; } diff --git a/test/T081-sexpr-search.sh b/test/T081-sexpr-search.sh index 4231dd38..73f45041 100755 --- a/test/T081-sexpr-search.sh +++ b/test/T081-sexpr-search.sh @@ -832,13 +832,11 @@ EOF test_expect_equal_file EXPECTED OUTPUT test_begin_subtest "lastmod query, empty" -test_subtest_known_broken notmuch search from:keithp | notmuch_search_sanitize > EXPECTED notmuch search --query=sexp '(and (lastmod) (from keithp))'| notmuch_search_sanitize > OUTPUT test_expect_equal_file EXPECTED OUTPUT test_begin_subtest "lastmod query, one argument" -test_subtest_known_broken notmuch tag +4EFC743A.3060609@april.org id:4EFC743A.3060609@april.org revision=$(notmuch count --lastmod '*' | cut -f3) notmuch search lastmod:$revision..$revision | notmuch_search_sanitize > EXPECTED @@ -846,7 +844,6 @@ notmuch search --query=sexp "(and (lastmod $revision))" | notmuch_search_saniti test_expect_equal_file EXPECTED OUTPUT test_begin_subtest "lastmod query, two arguments" -test_subtest_known_broken notmuch tag +keithp from:keithp revision2=$(notmuch count --lastmod '*' | cut -f3) notmuch search lastmod:$revision..$revision2 | notmuch_search_sanitize > EXPECTED @@ -854,7 +851,6 @@ notmuch search --query=sexp "(and (lastmod $revision $revision2))" | notmuch_se test_expect_equal_file EXPECTED OUTPUT test_begin_subtest "lastmod query, illegal nesting 1" -test_subtest_known_broken notmuch search --query=sexp '(to (lastmod))' > OUTPUT 2>&1 cat < EXPECTED notmuch search: Syntax error in query @@ -863,7 +859,6 @@ EOF test_expect_equal_file EXPECTED OUTPUT test_begin_subtest "lastmod query, bad from revision" -test_subtest_known_broken notmuch search --query=sexp '(lastmod apples)' > OUTPUT 2>&1 cat < EXPECTED notmuch search: Syntax error in query @@ -872,7 +867,6 @@ EOF test_expect_equal_file EXPECTED OUTPUT test_begin_subtest "lastmod query, bad to revision" -test_subtest_known_broken notmuch search --query=sexp '(lastmod 0 apples)' > OUTPUT 2>&1 cat < EXPECTED notmuch search: Syntax error in query @@ -881,7 +875,6 @@ EOF test_expect_equal_file EXPECTED OUTPUT test_begin_subtest "lastmod query, illegal nesting 2" -test_subtest_known_broken notmuch search --query=sexp '(to (lastmod 2021-11-18))' > OUTPUT 2>&1 cat < EXPECTED notmuch search: Syntax error in query @@ -890,7 +883,6 @@ EOF test_expect_equal_file EXPECTED OUTPUT test_begin_subtest "lastmod query, illegal nesting 3" -test_subtest_known_broken notmuch search --query=sexp '(lastmod (to))' > OUTPUT 2>&1 cat < EXPECTED notmuch search: Syntax error in query @@ -899,7 +891,6 @@ EOF test_expect_equal_file EXPECTED OUTPUT test_begin_subtest "lastmod query, illegal nesting 4" -test_subtest_known_broken notmuch search --query=sexp '(lastmod today (to))' > OUTPUT 2>&1 cat < EXPECTED notmuch search: Syntax error in query @@ -908,7 +899,6 @@ EOF test_expect_equal_file EXPECTED OUTPUT test_begin_subtest "lastmod query, too many arguments" -test_subtest_known_broken notmuch search --query=sexp '(lastmod yesterday and tommorow)' > OUTPUT 2>&1 cat < EXPECTED notmuch search: Syntax error in query -- 2.34.1