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 ms11 with LMTPS id MEzCB4VV8l/IXwAA0tVLHw (envelope-from ) for ; Sun, 03 Jan 2021 23:38:45 +0000 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 qAq4A4VV8l9OUQAAB5/wlQ (envelope-from ) for ; Sun, 03 Jan 2021 23:38:45 +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) server-signature RSA-PSS (2048 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 906B894038E for ; Sun, 3 Jan 2021 23:38:44 +0000 (UTC) Received: from nmbug.tethera.net (localhost [127.0.0.1]) by mail.notmuchmail.org (Postfix) with ESMTP id EEE8529E84; Sun, 3 Jan 2021 18:37:17 -0500 (EST) Received: from fethera.tethera.net (fethera.tethera.net [198.245.60.197]) by mail.notmuchmail.org (Postfix) with ESMTP id 6E32C29D97 for ; Sun, 3 Jan 2021 18:36:27 -0500 (EST) Received: by fethera.tethera.net (Postfix, from userid 1001) id 5D3575FF47; Sun, 3 Jan 2021 18:36:27 -0500 (EST) Received: (nullmailer pid 126230 invoked by uid 1000); Sun, 03 Jan 2021 23:35:56 -0000 From: David Bremner To: notmuch@notmuchmail.org Cc: David Bremner Subject: [PATCH 18/36] cli/reindex: convert new config framework Date: Sun, 3 Jan 2021 19:35:29 -0400 Message-Id: <20210103233547.122707-19-david@tethera.net> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210103233547.122707-1-david@tethera.net> References: <20210103233547.122707-1-david@tethera.net> MIME-Version: 1.0 Message-ID-Hash: 76D4IEUV3TOMEZE7W37BTZTAHJXVYWZ3 X-Message-ID-Hash: 76D4IEUV3TOMEZE7W37BTZTAHJXVYWZ3 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 X-Migadu-Spam-Score: -1.06 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: 906B894038E X-Spam-Score: -1.06 X-Migadu-Scanner: scn0.migadu.com X-TUID: dYA4Xz7WLPS9 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