From: David Bremner <david@tethera.net>
To: notmuch@notmuchmail.org
Cc: David Bremner <david@tethera.net>
Subject: [PATCH 16/24] cli/reindex: convert new config framework
Date: Thu, 24 Dec 2020 20:42:20 -0400 [thread overview]
Message-ID: <20201225004228.647328-17-david@tethera.net> (raw)
In-Reply-To: <20201225004228.647328-1-david@tethera.net>
The only non-trivial part is switching the talloc context for
query_string_from args from 'config' to 'notmuch'.
---
notmuch-reindex.c | 9 ++-------
notmuch.c | 2 +-
test/T700-reindex.sh | 10 ++++++++++
3 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/notmuch-reindex.c b/notmuch-reindex.c
index 9d337c48..fa84d4fc 100644
--- a/notmuch-reindex.c
+++ b/notmuch-reindex.c
@@ -83,10 +83,9 @@ reindex_query (notmuch_database_t *notmuch, const char *query_string,
}
int
-notmuch_reindex_command (notmuch_config_t *config, unused(notmuch_database_t *notmuch), int argc, char *argv[])
+notmuch_reindex_command (unused(notmuch_config_t *config), notmuch_database_t *notmuch, int argc, char *argv[])
{
char *query_string = NULL;
- notmuch_database_t *notmuch;
struct sigaction action;
int opt_index;
int ret;
@@ -111,10 +110,6 @@ notmuch_reindex_command (notmuch_config_t *config, unused(notmuch_database_t *no
notmuch_process_shared_options (argv[0]);
- if (notmuch_database_open (notmuch_config_get_database_path (config),
- NOTMUCH_DATABASE_MODE_READ_WRITE, ¬much))
- return EXIT_FAILURE;
-
notmuch_exit_if_unmatched_db_uuid (notmuch);
status = notmuch_process_shared_indexing_options (notmuch);
@@ -124,7 +119,7 @@ notmuch_reindex_command (notmuch_config_t *config, unused(notmuch_database_t *no
return EXIT_FAILURE;
}
- query_string = query_string_from_args (config, argc - opt_index, argv + opt_index);
+ query_string = query_string_from_args (notmuch, argc - opt_index, argv + opt_index);
if (query_string == NULL) {
fprintf (stderr, "Out of memory\n");
return EXIT_FAILURE;
diff --git a/notmuch.c b/notmuch.c
index 8e697396..82d68681 100644
--- a/notmuch.c
+++ b/notmuch.c
@@ -165,7 +165,7 @@ static command_t commands[] = {
"Restore the tags from the given dump file (see 'dump')." },
{ "compact", notmuch_compact_command, NOTMUCH_COMMAND_CONFIG_OPEN,
"Compact the notmuch database." },
- { "reindex", notmuch_reindex_command, NOTMUCH_COMMAND_CONFIG_OPEN,
+ { "reindex", notmuch_reindex_command, NOTMUCH_COMMAND_DATABASE_EARLY | NOTMUCH_COMMAND_DATABASE_WRITE,
"Re-index all messages matching the search terms." },
{ "config", notmuch_config_command, NOTMUCH_COMMAND_CONFIG_OPEN,
"Get or set settings in the notmuch configuration file." },
diff --git a/test/T700-reindex.sh b/test/T700-reindex.sh
index 3d7c930d..67ee8452 100755
--- a/test/T700-reindex.sh
+++ b/test/T700-reindex.sh
@@ -75,6 +75,16 @@ notmuch reindex '*'
notmuch dump | grep '^#=' | sort > OUTPUT
test_expect_equal_file prop-dump OUTPUT
+test_begin_subtest "reindex with saved query from config file"
+query_name="test${RANDOM}"
+count1=$(notmuch count --lastmod '*' | cut -f3)
+cp notmuch-config old-config
+printf "\n[query]\n${query_name} = tag:inbox\n" >> notmuch-config
+notmuch reindex query:$query_name
+count2=$(notmuch count --lastmod '*' | cut -f3)
+cp old-config notmuch-config
+test_expect_success "test '$count2 -gt $count1'"
+
add_email_corpus lkml
test_begin_subtest "reindex of lkml corpus preserves threads"
--
2.29.2
next prev parent reply other threads:[~2020-12-25 0:43 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-25 0:42 v2 Merged Config David Bremner
2020-12-25 0:42 ` [PATCH 01/24] lib: add _notmuch_string_map_set David Bremner
2020-12-25 0:42 ` [PATCH 02/24] lib: cache configuration information from database David Bremner
2020-12-25 0:42 ` [PATCH 03/24] lib: add stub for notmuch_database_open_with_config David Bremner
2020-12-26 13:13 ` David Bremner
2020-12-25 0:42 ` [PATCH 04/24] lib/open: add support for config profiles and default locations David Bremner
2020-12-25 0:42 ` [PATCH 05/24] CLI: generalize notmuch_config_mode_t David Bremner
2020-12-25 0:42 ` [PATCH 06/24] lib/config: add notmuch_config_key_{get,set} David Bremner
2020-12-25 0:42 ` [PATCH 07/24] lib/open: load default values for known configuration keys David Bremner
2020-12-25 0:42 ` [PATCH 08/24] CLI: add (unused) database argument to subcommands David Bremner
2020-12-25 0:42 ` [PATCH 09/24] util: add strsplit_len: simplified strtok with delimiter escaping David Bremner
2020-12-25 0:42 ` [PATCH 10/24] lib/config: add config values iterator David Bremner
2020-12-25 0:42 ` [PATCH 11/24] CLI/count: switch to new configuration framework David Bremner
2020-12-25 0:42 ` [PATCH 12/24] cli/dump: convert to new config framework David Bremner
2020-12-25 0:42 ` [PATCH 13/24] lib: add notmuch_config_get_bool David Bremner
2020-12-25 0:42 ` [PATCH 14/24] CLI/restore: convert to new config framework David Bremner
2020-12-25 0:42 ` [PATCH 15/24] CLI/insert: " David Bremner
2020-12-25 0:42 ` David Bremner [this message]
2020-12-25 0:42 ` [PATCH 17/24] CLI/reply: " David Bremner
2020-12-25 0:42 ` [PATCH 18/24] CLI/{search,address}: convert to new configuration framework David Bremner
2020-12-25 0:42 ` [PATCH 19/24] cli/config: add accessor for config file name David Bremner
2020-12-25 0:42 ` [PATCH 20/24] CLI/show: mostly switch show to new config framework David Bremner
2020-12-25 0:42 ` [PATCH 21/24] cli/tag: convert " David Bremner
2020-12-25 0:42 ` [PATCH 22/24] lib/config: add _notmuch_config_cache David Bremner
2020-12-25 0:42 ` [PATCH 23/24] lib: split notmuch_database_compact David Bremner
2020-12-25 0:42 ` [PATCH 24/24] cli/compact: convert to new configuration framework 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=20201225004228.647328-17-david@tethera.net \
--to=david@tethera.net \
--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).