In this initial commit, support all term based fields, but only document/test the thread size feature. --- lib/parse-sexp.cc | 65 ++++++++++++++++++++++++++++++---------- test/T083-sexpr-count.sh | 30 +++++++++++++++++++ 2 files changed, 79 insertions(+), 16 deletions(-) create mode 100755 test/T083-sexpr-count.sh diff --git a/lib/parse-sexp.cc b/lib/parse-sexp.cc index 9cadbc13..efe564c7 100644 --- a/lib/parse-sexp.cc +++ b/lib/parse-sexp.cc @@ -34,6 +34,8 @@ typedef enum { SEXP_FLAG_ORPHAN = 1 << 8, SEXP_FLAG_RANGE = 1 << 9, SEXP_FLAG_PATHNAME = 1 << 10, + SEXP_FLAG_COUNT = 1 << 11, + SEXP_FLAG_MODIFIER = 1 << 12, } _sexp_flag_t; /* @@ -65,24 +67,28 @@ static _sexp_prefix_t prefixes[] = { "and", Xapian::Query::OP_AND, Xapian::Query::MatchAll, SEXP_FLAG_NONE }, { "attachment", Xapian::Query::OP_AND, Xapian::Query::MatchAll, - SEXP_FLAG_FIELD | SEXP_FLAG_WILDCARD | SEXP_FLAG_EXPAND }, + SEXP_FLAG_FIELD | SEXP_FLAG_WILDCARD | SEXP_FLAG_EXPAND | SEXP_FLAG_COUNT}, { "body", Xapian::Query::OP_AND, Xapian::Query::MatchAll, SEXP_FLAG_FIELD }, { "date", Xapian::Query::OP_INVALID, Xapian::Query::MatchAll, - SEXP_FLAG_RANGE }, + SEXP_FLAG_FIELD | SEXP_FLAG_RANGE }, + { "count", Xapian::Query::OP_INVALID, Xapian::Query::MatchAll, + SEXP_FLAG_MODIFIER | SEXP_FLAG_RANGE }, { "from", Xapian::Query::OP_AND, Xapian::Query::MatchAll, - SEXP_FLAG_FIELD | SEXP_FLAG_WILDCARD | SEXP_FLAG_REGEX | SEXP_FLAG_EXPAND }, + SEXP_FLAG_FIELD | SEXP_FLAG_WILDCARD | SEXP_FLAG_REGEX | SEXP_FLAG_EXPAND + | SEXP_FLAG_COUNT }, { "folder", Xapian::Query::OP_OR, Xapian::Query::MatchNothing, - SEXP_FLAG_FIELD | SEXP_FLAG_BOOLEAN | SEXP_FLAG_WILDCARD | SEXP_FLAG_REGEX | SEXP_FLAG_EXPAND | - SEXP_FLAG_PATHNAME }, + SEXP_FLAG_FIELD | SEXP_FLAG_BOOLEAN | SEXP_FLAG_WILDCARD | SEXP_FLAG_REGEX + | SEXP_FLAG_EXPAND | SEXP_FLAG_PATHNAME | SEXP_FLAG_COUNT }, { "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 | 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 }, + SEXP_FLAG_FIELD | SEXP_FLAG_BOOLEAN | SEXP_FLAG_WILDCARD | + SEXP_FLAG_REGEX | SEXP_FLAG_EXPAND | SEXP_FLAG_COUNT }, { "lastmod", Xapian::Query::OP_INVALID, Xapian::Query::MatchAll, - SEXP_FLAG_RANGE }, + SEXP_FLAG_FIELD | SEXP_FLAG_RANGE }, { "matching", Xapian::Query::OP_AND, Xapian::Query::MatchAll, SEXP_FLAG_DO_EXPAND }, { "mid", Xapian::Query::OP_OR, Xapian::Query::MatchNothing, @@ -97,9 +103,10 @@ static _sexp_prefix_t prefixes[] = SEXP_FLAG_NONE }, { "path", Xapian::Query::OP_OR, Xapian::Query::MatchNothing, SEXP_FLAG_FIELD | SEXP_FLAG_BOOLEAN | SEXP_FLAG_WILDCARD | SEXP_FLAG_REGEX | - SEXP_FLAG_PATHNAME }, + SEXP_FLAG_PATHNAME | SEXP_FLAG_COUNT}, { "property", Xapian::Query::OP_AND, Xapian::Query::MatchAll, - SEXP_FLAG_FIELD | SEXP_FLAG_BOOLEAN | SEXP_FLAG_WILDCARD | SEXP_FLAG_REGEX | SEXP_FLAG_EXPAND }, + SEXP_FLAG_FIELD | SEXP_FLAG_BOOLEAN | SEXP_FLAG_WILDCARD | + SEXP_FLAG_REGEX | SEXP_FLAG_EXPAND | SEXP_FLAG_COUNT }, { "query", Xapian::Query::OP_INVALID, Xapian::Query::MatchNothing, SEXP_FLAG_SINGLE | SEXP_FLAG_ORPHAN }, { "regex", Xapian::Query::OP_INVALID, Xapian::Query::MatchAll, @@ -109,13 +116,16 @@ static _sexp_prefix_t prefixes[] = { "starts-with", Xapian::Query::OP_WILDCARD, Xapian::Query::MatchAll, SEXP_FLAG_SINGLE }, { "subject", Xapian::Query::OP_AND, Xapian::Query::MatchAll, - SEXP_FLAG_FIELD | SEXP_FLAG_WILDCARD | SEXP_FLAG_REGEX | SEXP_FLAG_EXPAND }, + SEXP_FLAG_FIELD | SEXP_FLAG_WILDCARD | SEXP_FLAG_REGEX | SEXP_FLAG_EXPAND + | SEXP_FLAG_COUNT }, { "tag", Xapian::Query::OP_AND, Xapian::Query::MatchAll, - SEXP_FLAG_FIELD | SEXP_FLAG_BOOLEAN | SEXP_FLAG_WILDCARD | SEXP_FLAG_REGEX | SEXP_FLAG_EXPAND }, + SEXP_FLAG_FIELD | SEXP_FLAG_BOOLEAN | SEXP_FLAG_WILDCARD | SEXP_FLAG_REGEX + | SEXP_FLAG_EXPAND | SEXP_FLAG_COUNT}, { "thread", Xapian::Query::OP_OR, Xapian::Query::MatchNothing, - SEXP_FLAG_FIELD | SEXP_FLAG_BOOLEAN | SEXP_FLAG_WILDCARD | SEXP_FLAG_REGEX | SEXP_FLAG_EXPAND }, + SEXP_FLAG_FIELD | SEXP_FLAG_BOOLEAN | SEXP_FLAG_WILDCARD | SEXP_FLAG_REGEX | + SEXP_FLAG_EXPAND | SEXP_FLAG_COUNT }, { "to", Xapian::Query::OP_AND, Xapian::Query::MatchAll, - SEXP_FLAG_FIELD | SEXP_FLAG_WILDCARD | SEXP_FLAG_EXPAND }, + SEXP_FLAG_FIELD | SEXP_FLAG_WILDCARD | SEXP_FLAG_EXPAND | SEXP_FLAG_COUNT }, { } }; @@ -513,6 +523,7 @@ _sexp_expand_param (notmuch_database_t *notmuch, const _sexp_prefix_t *parent, static notmuch_status_t _sexp_parse_range (notmuch_database_t *notmuch, const _sexp_prefix_t *prefix, + const _sexp_prefix_t *parent, const sexp_t *sx, Xapian::Query &output) { const char *from, *to; @@ -552,6 +563,27 @@ _sexp_parse_range (notmuch_database_t *notmuch, const _sexp_prefix_t *prefix, to = ""; } + if (strcmp (prefix->name, "count") == 0) { + notmuch_status_t status; + if (! parent) { + _notmuch_database_log (notmuch, "illegal '%s' outside field\n", + prefix->name); + return NOTMUCH_STATUS_BAD_QUERY_SYNTAX; + } + if (! (parent->flags & SEXP_FLAG_COUNT)) { + _notmuch_database_log (notmuch, "'%s' not supported in field '%s'\n", + prefix->name, parent->name); + return NOTMUCH_STATUS_BAD_QUERY_SYNTAX; + } + + status = _notmuch_count_strings_to_query (notmuch, parent->name, from, to, output, msg); + if (status) { + if (! msg.empty ()) + _notmuch_database_log (notmuch, "%s\n", msg.c_str ()); + } + return status; + } + if (strcmp (prefix->name, "date") == 0) { notmuch_status_t status; status = _notmuch_date_strings_to_query (NOTMUCH_VALUE_TIMESTAMP, from, to, output, msg); @@ -612,7 +644,8 @@ _sexp_to_xapian_query (notmuch_database_t *notmuch, const _sexp_prefix_t *parent } else { Xapian::Query accumulator; for (_sexp_prefix_t *prefix = prefixes; prefix->name; prefix++) { - if (prefix->flags & SEXP_FLAG_FIELD) { + if (prefix->flags & SEXP_FLAG_FIELD && + !(prefix->flags & SEXP_FLAG_RANGE)) { Xapian::Query subquery; term_prefix = _notmuch_database_prefix (notmuch, prefix->name); status = _sexp_parse_one_term (notmuch, term_prefix, sx, subquery); @@ -654,7 +687,7 @@ _sexp_to_xapian_query (notmuch_database_t *notmuch, const _sexp_prefix_t *parent for (_sexp_prefix_t *prefix = prefixes; prefix && prefix->name; prefix++) { if (strcmp (prefix->name, sx->list->val) == 0) { - if (prefix->flags & (SEXP_FLAG_FIELD | SEXP_FLAG_RANGE)) { + if (prefix->flags & SEXP_FLAG_FIELD) { if (parent) { _notmuch_database_log (notmuch, "nested field: '%s' inside '%s'\n", prefix->name, parent->name); @@ -677,7 +710,7 @@ _sexp_to_xapian_query (notmuch_database_t *notmuch, const _sexp_prefix_t *parent } if (prefix->flags & SEXP_FLAG_RANGE) - return _sexp_parse_range (notmuch, prefix, sx->list->next, output); + return _sexp_parse_range (notmuch, prefix, parent, sx->list->next, output); if (strcmp (prefix->name, "infix") == 0) { return _sexp_parse_infix (notmuch, sx->list->next, output); diff --git a/test/T083-sexpr-count.sh b/test/T083-sexpr-count.sh new file mode 100755 index 00000000..e825ef3d --- /dev/null +++ b/test/T083-sexpr-count.sh @@ -0,0 +1,30 @@ +#!/usr/bin/env bash +test_description='"(count ...)" modifier for sexp queries' +. $(dirname "$0")/test-lib.sh || exit 1 + +if [ $NOTMUCH_HAVE_SFSEXP -ne 1 ]; then + printf "Skipping due to missing sfsexp library\n" + test_done +fi + +add_email_corpus + +test_begin_subtest "threads with one message" +notmuch search --query=sexp '(and (from gusarov) (thread (count 1)))' | notmuch_search_sanitize > OUTPUT +cat <<EOF >EXPECTED +thread:XXX 2009-11-17 [1/1] Mikhail Gusarov; [notmuch] [PATCH] Handle rename of message file (inbox unread) +EOF +test_expect_equal_file EXPECTED OUTPUT + +test_begin_subtest "partition threads by size" +notmuch count --output=threads --query=sexp '()' > OUTPUT +notmuch count --output=threads --query=sexp '(thread (count 1 2))' >> OUTPUT +notmuch count --output=threads --query=sexp '(thread (count 3 *))' >> OUTPUT +cat <<EOF >EXPECTED +24 +16 +8 +EOF +test_expect_equal_file EXPECTED OUTPUT + +test_done -- 2.39.1 _______________________________________________ notmuch mailing list -- notmuch@notmuchmail.org To unsubscribe send an email to notmuch-leave@notmuchmail.org