From: David Bremner <david@tethera.net>
To: "Rollins, Jameson" <jrollins@caltech.edu>,
David Bremner <david@tethera.net>,
"Jorge P. de Morais Neto" <jorge+list@disroot.org>,
"notmuch@notmuchmail.org" <notmuch@notmuchmail.org>
Subject: [PATCH 2/3] lib: introduce N_F_GROUP and use it to fix implicit AND for from:
Date: Wed, 21 Aug 2019 08:41:25 -0300 [thread overview]
Message-ID: <20190821114126.23540-3-david@tethera.net> (raw)
In-Reply-To: <20190821114126.23540-1-david@tethera.net>
This needs tests for every prefix and documentation
---
lib/database-private.h | 1 +
lib/database.cc | 23 +++++++++++++++++------
test/T760-implicit-operators.sh | 4 ++--
3 files changed, 20 insertions(+), 8 deletions(-)
diff --git a/lib/database-private.h b/lib/database-private.h
index 87ae1bdf..a5eb83cb 100644
--- a/lib/database-private.h
+++ b/lib/database-private.h
@@ -159,6 +159,7 @@ typedef enum notmuch_field_flags {
NOTMUCH_FIELD_EXTERNAL = 1 << 0,
NOTMUCH_FIELD_PROBABILISTIC = 1 << 1,
NOTMUCH_FIELD_PROCESSOR = 1 << 2,
+ NOTMUCH_FIELD_GROUP = 1 << 3,
} notmuch_field_flag_t;
/*
diff --git a/lib/database.cc b/lib/database.cc
index 24b7ec43..5d6c4ee6 100644
--- a/lib/database.cc
+++ b/lib/database.cc
@@ -272,16 +272,21 @@ prefix_t prefix_table[] = {
{ "body", "", NOTMUCH_FIELD_EXTERNAL |
NOTMUCH_FIELD_PROBABILISTIC },
{ "thread", "G", NOTMUCH_FIELD_EXTERNAL |
- NOTMUCH_FIELD_PROCESSOR },
+ NOTMUCH_FIELD_PROCESSOR |
+ NOTMUCH_FIELD_GROUP
+ },
{ "tag", "K", NOTMUCH_FIELD_EXTERNAL |
NOTMUCH_FIELD_PROCESSOR },
{ "is", "K", NOTMUCH_FIELD_EXTERNAL |
NOTMUCH_FIELD_PROCESSOR },
- { "id", "Q", NOTMUCH_FIELD_EXTERNAL },
+ { "id", "Q", NOTMUCH_FIELD_EXTERNAL |
+ NOTMUCH_FIELD_GROUP },
{ "mid", "Q", NOTMUCH_FIELD_EXTERNAL |
NOTMUCH_FIELD_PROCESSOR },
{ "path", "P", NOTMUCH_FIELD_EXTERNAL |
- NOTMUCH_FIELD_PROCESSOR },
+ NOTMUCH_FIELD_PROCESSOR |
+ NOTMUCH_FIELD_GROUP
+ },
{ "property", "XPROPERTY", NOTMUCH_FIELD_EXTERNAL },
/*
* Unconditionally add ':' to reduce potential ambiguity with
@@ -290,10 +295,14 @@ prefix_t prefix_table[] = {
* discussion.
*/
{ "folder", "XFOLDER:", NOTMUCH_FIELD_EXTERNAL |
- NOTMUCH_FIELD_PROCESSOR },
+ NOTMUCH_FIELD_PROCESSOR |
+ NOTMUCH_FIELD_GROUP
+ },
#if HAVE_XAPIAN_FIELD_PROCESSOR
{ "date", NULL, NOTMUCH_FIELD_EXTERNAL |
- NOTMUCH_FIELD_PROCESSOR },
+ NOTMUCH_FIELD_PROCESSOR |
+ NOTMUCH_FIELD_GROUP
+ },
{ "query", NULL, NOTMUCH_FIELD_EXTERNAL |
NOTMUCH_FIELD_PROCESSOR },
#endif
@@ -400,7 +409,9 @@ _setup_query_field (const prefix_t *prefix, notmuch_database_t *notmuch)
/* we treat all field-processor fields as boolean in order to get the raw input */
if (prefix->prefix)
notmuch->query_parser->add_prefix ("", prefix->prefix);
- notmuch->query_parser->add_boolean_prefix (prefix->name, fp);
+ notmuch->query_parser->add_boolean_prefix (prefix->name, fp,
+ !(prefix->flags & NOTMUCH_FIELD_PROBABILISTIC) &&
+ (prefix->flags & NOTMUCH_FIELD_GROUP));
} else {
_setup_query_field_default (prefix, notmuch);
}
diff --git a/test/T760-implicit-operators.sh b/test/T760-implicit-operators.sh
index b79673df..1a6ba61f 100755
--- a/test/T760-implicit-operators.sh
+++ b/test/T760-implicit-operators.sh
@@ -21,8 +21,8 @@ EOF
test_expect_equal_file EXPECTED OUTPUT
}
-test_AND from test_subtest_known_broken
-test_AND subject test_subtest_known_broken
+test_AND from
+test_AND subject
test_AND to
test_done
--
2.23.0.rc1
next prev parent reply other threads:[~2019-08-21 12:25 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-11 17:20 Apparently, terms with a common prefix are *not* connected by implicit "OR" Jorge P. de Morais Neto
2019-08-11 23:08 ` David Bremner
2019-08-15 14:58 ` Jorge P. de Morais Neto
2019-08-21 1:39 ` David Bremner
2019-08-21 5:48 ` Rollins, Jameson
2019-08-21 11:41 ` WIP: fix implicit operators David Bremner
2019-08-21 11:41 ` [PATCH 1/3] test: add known broken tests for from: and subject: David Bremner
2019-08-25 9:33 ` Tomi Ollila
2019-08-21 11:41 ` David Bremner [this message]
2019-08-21 11:41 ` [PATCH 3/3] WIP/test: extend field grouping tests David Bremner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://notmuchmail.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190821114126.23540-3-david@tethera.net \
--to=david@tethera.net \
--cc=jorge+list@disroot.org \
--cc=jrollins@caltech.edu \
--cc=notmuch@notmuchmail.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://yhetil.org/notmuch.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).