From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id mJZrOOMp7mAIewAAgWs5BA (envelope-from ) for ; Wed, 14 Jul 2021 02:03:47 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id +D0nNOMp7mAlVwAAB5/wlQ (envelope-from ) for ; Wed, 14 Jul 2021 00:03:47 +0000 Received: from mail.notmuchmail.org (nmbug.tethera.net [144.217.243.247]) (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 777F6CC8C for ; Wed, 14 Jul 2021 02:03:47 +0200 (CEST) Received: from nmbug.tethera.net (localhost [127.0.0.1]) by mail.notmuchmail.org (Postfix) with ESMTP id A9BFD29114; Tue, 13 Jul 2021 20:03:13 -0400 (EDT) Received: from fethera.tethera.net (fethera.tethera.net [IPv6:2607:5300:60:c5::1]) by mail.notmuchmail.org (Postfix) with ESMTP id A99CE29083 for ; Tue, 13 Jul 2021 20:02:51 -0400 (EDT) Received: by fethera.tethera.net (Postfix, from userid 1001) id 9FD2B5FD21; Tue, 13 Jul 2021 20:02:51 -0400 (EDT) Received: (nullmailer pid 804657 invoked by uid 1000); Wed, 14 Jul 2021 00:02:42 -0000 From: David Bremner To: notmuch@notmuchmail.org Cc: David Bremner Subject: [PATCH 05/11] lib/parse-sexp: parse 'and', 'not', 'or' Date: Tue, 13 Jul 2021 21:02:33 -0300 Message-Id: <20210714000239.804384-6-david@tethera.net> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210714000239.804384-1-david@tethera.net> References: <20210714000239.804384-1-david@tethera.net> MIME-Version: 1.0 Message-ID-Hash: I6KPVKNOKHSN66XLZLE7H6GM5TVH4CM4 X-Message-ID-Hash: I6KPVKNOKHSN66XLZLE7H6GM5TVH4CM4 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=1626221027; 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=tot3oyr7Qt5n/HKh1f/3GL3Y+6QyBFIXrdbUk/q2bKw=; b=ex+oNVFyF9c+YEuzJBN7/aAulyp67QxCssC70DO08EloecwpVCUSTF92uHXAPCZTeMif+/ Y1NX5SLm3Arn7/uu8I1LeirOil/U3dp4J7oRzip1TK3us3OgwAjTH7jY3aP0IwDfshK79J VOwA3qqfKmqRLvsGoytoqv/x2xmiy6tY2nyV9gUSqqcTTCq8DswCmUtCvtv1PA6tO1rWZl LOEpxIusVlc7CeY8AsD4dK10KKm6253knHjoNg8vMTHoWx8lVPmfWedbtuQKYYTZCIk9A4 z5cVaPzdPcZO6MRF1tviPKiFgbKTiVBynBHBA9kXiylTBQ5cxOMHzTiG/R0QMw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1626221027; a=rsa-sha256; cv=none; b=A42VAXqppoORPcZmxyGGGekkWv8uzo0auT6inwr1i3e6g/A0kxtesqhczGNXOKtYt4XFOw QXx9FmrkZilGNCWtijIDXNRjJovsYDsL0oCK+hykuKIkLBiGnmLSEg7RPB9dm8oQWQ/SQ4 3KWXwSWNJjAARipsHVqL89yDmdTqDmFRoTWr5/KEqbtki9jvu590mbvl6LS2eYwS2/Fj/h Sy2zFJSFEI44URJhDcjDsr9v1MuXic9mAHA6PoPh/Dfk50p4WdaO5IvqiZm9O74pDFyI97 KkYBODgemKEfbtgFMwgtc1VniSQcnRlRAa9XB+oG4u7TEBvy9CSNCekh0vqWEA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 144.217.243.247 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Migadu-Spam-Score: -1.08 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 144.217.243.247 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Migadu-Queue-Id: 777F6CC8C X-Spam-Score: -1.08 X-Migadu-Scanner: scn0.migadu.com X-TUID: 9aSVeI7RIHsN This is not too useful yet, but provides gluing together queries in various ways, which is actually one of the main motivations for the s-expression query format. --- lib/Makefile.local | 3 +- lib/parse-sexp.cc | 72 +++++++++++++++++++++++++++++++++++++++ lib/query.cc | 7 ++-- test/T080-search.sh | 5 --- test/T081-sexpr-search.sh | 22 ++++++++++++ 5 files changed, 100 insertions(+), 9 deletions(-) create mode 100644 lib/parse-sexp.cc create mode 100755 test/T081-sexpr-search.sh diff --git a/lib/Makefile.local b/lib/Makefile.local index e2d4b91d..1378a74b 100644 --- a/lib/Makefile.local +++ b/lib/Makefile.local @@ -63,7 +63,8 @@ libnotmuch_cxx_srcs = \ $(dir)/features.cc \ $(dir)/prefix.cc \ $(dir)/open.cc \ - $(dir)/init.cc + $(dir)/init.cc \ + $(dir)/parse-sexp.cc libnotmuch_modules := $(libnotmuch_c_srcs:.c=.o) $(libnotmuch_cxx_srcs:.cc=.o) diff --git a/lib/parse-sexp.cc b/lib/parse-sexp.cc new file mode 100644 index 00000000..eded98e7 --- /dev/null +++ b/lib/parse-sexp.cc @@ -0,0 +1,72 @@ +#include +#include "notmuch-private.h" +#include "sexp.h" + +typedef struct { + const char *name; + Xapian::Query::op xapian_op; + Xapian::Query initial; +} _sexp_op_t; + +static _sexp_op_t operations[] = +{ + { "and", Xapian::Query::OP_AND, Xapian::Query::MatchAll }, + { "not", Xapian::Query::OP_AND_NOT, Xapian::Query::MatchAll }, + { "or", Xapian::Query::OP_OR, Xapian::Query::MatchNothing }, + { } +}; + +static Xapian::Query _sexp_to_xapian_query (sexp_t *sx); + +static Xapian::Query +_sexp_combine_query (Xapian::Query::op operation, + Xapian::Query left, + sexp_t *sx) +{ + + /* if we run out elements, return accumulator */ + + if (! sx) + return left; + + return _sexp_combine_query (operation, + Xapian::Query (operation, + left, + _sexp_to_xapian_query (sx)), + sx->next); +} + +Xapian::Query +_notmuch_sexp_string_to_xapian_query (notmuch_database_t *notmuch, const char *querystr) +{ + sexp_t *sx = NULL; + char *buf = talloc_strdup (notmuch, querystr); + + sx = parse_sexp (buf, strlen (querystr)); + return _sexp_to_xapian_query (sx); +} + +/* 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 */ + +static Xapian::Query +_sexp_to_xapian_query (sexp_t *sx) +{ + + const _sexp_op_t *op; + + /* Currently we don't understand atoms */ + assert (sx->ty == SEXP_LIST); + + /* Empty list */ + if (! sx->list) + return Xapian::Query::MatchAll; + + for (op = operations; op && op->name; op++) { + if (strcasecmp (op->name, hd_sexp (sx)->val) == 0) + return _sexp_combine_query (op->xapian_op, op->initial, sx->list->next); + } + + INTERNAL_ERROR ("unimplemented prefix %s\n", sx->list->val); +} diff --git a/lib/query.cc b/lib/query.cc index 9d2b6e50..6e89af60 100644 --- a/lib/query.cc +++ b/lib/query.cc @@ -20,11 +20,10 @@ #include "notmuch-private.h" #include "database-private.h" +#include "parse-sexp.h" #include /* GHashTable, GPtrArray */ -#include "sexp.h" - typedef enum { NOTMUCH_QUERY_SYNTAX_XAPIAN, NOTMUCH_QUERY_SYNTAX_SEXPR, @@ -192,7 +191,9 @@ _notmuch_query_ensure_parsed_xapian (notmuch_query_t *query) static notmuch_status_t _notmuch_query_ensure_parsed_sexpr (notmuch_query_t *query) { - query->xapian_query = Xapian::Query::MatchAll; + + query->xapian_query = _notmuch_sexp_string_to_xapian_query (query->notmuch, query->query_string); + return NOTMUCH_STATUS_SUCCESS; } diff --git a/test/T080-search.sh b/test/T080-search.sh index 966e772a..a3f0dead 100755 --- a/test/T080-search.sh +++ b/test/T080-search.sh @@ -189,9 +189,4 @@ test_begin_subtest "parts do not have adjacent term positions" output=$(notmuch search id:termpos and '"c x"') test_expect_equal "$output" "" -test_begin_subtest "sexpr query: all messages" -notmuch search '*' > EXPECTED -notmuch search --query-syntax=sexp '()' > OUTPUT -test_expect_equal_file EXPECTED OUTPUT - test_done diff --git a/test/T081-sexpr-search.sh b/test/T081-sexpr-search.sh new file mode 100755 index 00000000..0b75334a --- /dev/null +++ b/test/T081-sexpr-search.sh @@ -0,0 +1,22 @@ +#!/usr/bin/env bash +test_description='"notmuch search" in several variations' +. $(dirname "$0")/test-lib.sh || exit 1 + +add_email_corpus + +for query in '()' '(not)' '(and)' '(or ())' '(or (not))' '(or (and))' \ + '(or (and) (or) (not (and)))'; do + test_begin_subtest "all messages: $query" + notmuch search '*' > EXPECTED + notmuch search --query-syntax=sexp "$query" > OUTPUT + test_expect_equal_file EXPECTED OUTPUT +done + +for query in '(or)' '(not ())' '(not (not))' '(not (and))' \ + '(not (or (and) (or) (not (and))))'; do + test_begin_subtest "no messages: $query" + notmuch search --query-syntax=sexp "$query" > OUTPUT + test_expect_equal_file /dev/null OUTPUT +done + +test_done -- 2.30.2