From: David Bremner <david@tethera.net>
To: notmuch@notmuchmail.org
Cc: David Bremner <david@tethera.net>
Subject: [PATCH 19/23] lib/compact: enable split config
Date: Sun, 7 Feb 2021 20:41:05 -0400 [thread overview]
Message-ID: <20210208004109.1192719-20-david@tethera.net> (raw)
In-Reply-To: <20210208004109.1192719-1-david@tethera.net>
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 | 6 ++++++
4 files changed, 17 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 731757cc..ecad87a6 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 a577ddca..2311d4a0 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 e5036400..7bd9739b 100755
--- a/test/T055-path-config.sh
+++ b/test/T055-path-config.sh
@@ -116,6 +116,12 @@ for config in traditional split+prefix split XDG XDG+profile; do
test_expect_equal_file $gen_msg_filename OUTPUT
rm -f $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
next prev parent reply other threads:[~2021-02-08 0:41 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-08 0:40 Support flexible database location David Bremner
2021-02-08 0:40 ` [PATCH 01/23] lib: publish API for notmuch_database_reopen David Bremner
2021-02-08 0:40 ` [PATCH 02/23] lib: save path of xapian database in notmuch struct David Bremner
2021-02-08 0:40 ` [PATCH 03/23] lib: support reopening databases for write access David Bremner
2021-02-08 0:40 ` [PATCH 04/23] CLI/show: complete conversion to new configuration framework David Bremner
2021-02-08 0:40 ` [PATCH 05/23] lib/open: support NOTMUCH_DATABASE environment variable David Bremner
2021-02-08 0:40 ` [PATCH 06/23] lib/open: allocate notmuch_t struct early David Bremner
2021-02-08 0:40 ` [PATCH 07/23] support splitting mail from database location David Bremner
2021-02-08 0:40 ` [PATCH 08/23] " David Bremner
2021-02-08 0:40 ` [PATCH 09/23] lib/open: factor out library intialization David Bremner
2021-02-08 0:40 ` [PATCH 10/23] lib/open: factor out the second half of n_d_open_with_config David Bremner
2021-02-08 0:40 ` [PATCH 11/23] lib/open: use _finish_open in n_d_create_with_config David Bremner
2021-02-08 0:40 ` [PATCH 12/23] lib/open: reuse directory checks from n_d_c_with_config David Bremner
2021-02-08 0:40 ` [PATCH 13/23] lib/open: open existing databases without .notmuch in path David Bremner
2021-02-08 0:41 ` [PATCH 14/23] lib/open: support XDG_DATA_HOME as a fallback database location David Bremner
2021-02-08 0:41 ` [PATCH 15/23] CLI/new: support split database and mail location David Bremner
2021-02-08 0:41 ` [PATCH 16/23] CLI/insert: support split database and mail root David Bremner
2021-02-08 0:41 ` [PATCH 17/23] lib: remove "path" from notmuch struct David Bremner
2021-02-08 0:41 ` [PATCH 18/23] CLI/show: add tests for raw output in split config David Bremner
2021-02-08 0:41 ` David Bremner [this message]
2021-02-08 0:41 ` [PATCH 20/23] CLI/reply: tests for " David Bremner
2021-02-08 0:41 ` [PATCH 21/23] CLI/address: " David Bremner
2021-02-08 0:41 ` [PATCH 22/23] test: add tests for dump and restore in split configuration David Bremner
2021-02-08 0:41 ` [PATCH 23/23] test: add test for reindex in split configurations 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=20210208004109.1192719-20-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).