From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id +I3lIKN4LWC9GgAA0tVLHw (envelope-from ) for ; Wed, 17 Feb 2021 20:12:19 +0000 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id 4Ka7HKN4LWDtZAAAB5/wlQ (envelope-from ) for ; Wed, 17 Feb 2021 20:12:19 +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)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 28CD02141B for ; Wed, 17 Feb 2021 21:12:18 +0100 (CET) Received: from nmbug.tethera.net (localhost [127.0.0.1]) by mail.notmuchmail.org (Postfix) with ESMTP id A947F26C41; Wed, 17 Feb 2021 15:11:25 -0500 (EST) Received: from fethera.tethera.net (fethera.tethera.net [198.245.60.197]) by mail.notmuchmail.org (Postfix) with ESMTP id 39EB726A27 for ; Wed, 17 Feb 2021 15:11:03 -0500 (EST) Received: by fethera.tethera.net (Postfix, from userid 1001) id 330486067D; Wed, 17 Feb 2021 15:11:03 -0500 (EST) Received: (nullmailer pid 2021442 invoked by uid 1000); Wed, 17 Feb 2021 20:10:50 -0000 From: David Bremner To: notmuch@notmuchmail.org Cc: David Bremner Subject: [PATCH 18/21] lib/compact: enable split config Date: Wed, 17 Feb 2021 16:10:42 -0400 Message-Id: <20210217201045.2021106-19-david@tethera.net> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210217201045.2021106-1-david@tethera.net> References: <20210217201045.2021106-1-david@tethera.net> MIME-Version: 1.0 Message-ID-Hash: CSN7GZOFF7ZEP5FKYBECK2L6IVT36JCH X-Message-ID-Hash: CSN7GZOFF7ZEP5FKYBECK2L6IVT36JCH 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: 0.47 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: 28CD02141B X-Spam-Score: 0.47 X-Migadu-Scanner: scn1.migadu.com X-TUID: Xx+LLakRDOYG This promotes _choose_xapian_path from static to extern linkage in order to share between open.cc and database.cc. --- lib/database.cc | 13 ++++--------- lib/notmuch-private.h | 4 ++++ lib/open.cc | 6 +++--- test/T055-path-config.sh | 7 +++++++ 4 files changed, 18 insertions(+), 12 deletions(-) diff --git a/lib/database.cc b/lib/database.cc index 1d8839a5..ffd42ac4 100644 --- a/lib/database.cc +++ b/lib/database.cc @@ -607,11 +607,12 @@ notmuch_database_compact_db (notmuch_database_t *notmuch, notmuch_compact_status_cb_t status_cb, void *closure) { void *local; - char *notmuch_path, *xapian_path, *compact_xapian_path; + const char *xapian_path, *compact_xapian_path; const char* path; notmuch_status_t ret = NOTMUCH_STATUS_SUCCESS; struct stat statbuf; bool keep_backup; + char *message; ret = _notmuch_database_ensure_writable (notmuch); if (ret) @@ -625,15 +626,9 @@ notmuch_database_compact_db (notmuch_database_t *notmuch, if (! local) return NOTMUCH_STATUS_OUT_OF_MEMORY; - if (! (notmuch_path = talloc_asprintf (local, "%s/%s", path, ".notmuch"))) { - ret = NOTMUCH_STATUS_OUT_OF_MEMORY; - goto DONE; - } - - if (! (xapian_path = talloc_asprintf (local, "%s/%s", notmuch_path, "xapian"))) { - ret = NOTMUCH_STATUS_OUT_OF_MEMORY; + ret = _notmuch_choose_xapian_path (local, path, &xapian_path, &message); + if (ret) goto DONE; - } if (! (compact_xapian_path = talloc_asprintf (local, "%s.compact", xapian_path))) { ret = NOTMUCH_STATUS_OUT_OF_MEMORY; diff --git a/lib/notmuch-private.h b/lib/notmuch-private.h index 4516061b..f871756d 100644 --- a/lib/notmuch-private.h +++ b/lib/notmuch-private.h @@ -726,6 +726,10 @@ _notmuch_config_load_defaults (notmuch_database_t * db); void _notmuch_config_cache (notmuch_database_t *db, notmuch_config_key_t key, const char* val); +/* open.cc */ +notmuch_status_t +_notmuch_choose_xapian_path (void *ctx, const char *database_path, const char **xapian_path, char **message); + NOTMUCH_END_DECLS #ifdef __cplusplus diff --git a/lib/open.cc b/lib/open.cc index a21f6252..1e2a62cd 100644 --- a/lib/open.cc +++ b/lib/open.cc @@ -250,8 +250,8 @@ _trial_open (const char *xapian_path, char **message_ptr) return NOTMUCH_STATUS_SUCCESS; } -static notmuch_status_t -_choose_xapian_path (void *ctx, const char *database_path, const char **xapian_path, char **message_ptr){ +notmuch_status_t +_notmuch_choose_xapian_path (void *ctx, const char *database_path, const char **xapian_path, char **message_ptr){ notmuch_status_t status; const char *trial_path, *notmuch_path; @@ -474,7 +474,7 @@ notmuch_database_open_with_config (const char *database_path, _set_database_path (notmuch, database_path); - status = _choose_xapian_path (local, database_path, ¬much->xapian_path, &message); + status = _notmuch_choose_xapian_path (local, database_path, ¬much->xapian_path, &message); if (status) goto DONE; diff --git a/test/T055-path-config.sh b/test/T055-path-config.sh index fb5174ac..e4812c82 100755 --- a/test/T055-path-config.sh +++ b/test/T055-path-config.sh @@ -177,6 +177,13 @@ EOF cur_msg_filename=$(notmuch search --output=files "subject:insert-subject") test_expect_equal_file "$cur_msg_filename" "$gen_msg_filename" + + test_begin_subtest "compact+search ($config)" + notmuch search --output=messages '*' | sort > EXPECTED + notmuch compact + notmuch search --output=messages '*' | sort > OUTPUT + test_expect_equal_file EXPECTED OUTPUT + restore_config done -- 2.30.0