From: David Bremner <david@tethera.net>
To: notmuch@notmuchmail.org
Cc: David Bremner <david@tethera.net>
Subject: [PATCH 23/24] lib: split notmuch_database_compact
Date: Thu, 24 Dec 2020 20:42:27 -0400 [thread overview]
Message-ID: <20201225004228.647328-24-david@tethera.net> (raw)
In-Reply-To: <20201225004228.647328-1-david@tethera.net>
The "back end" function takes an open notmuch database, which should
know its own path (i.e. the path needs to be cached in the
configuration data).
---
lib/database.cc | 42 +++++++++++++++++++++++++++++++++---------
lib/notmuch.h | 12 ++++++++++++
2 files changed, 45 insertions(+), 9 deletions(-)
diff --git a/lib/database.cc b/lib/database.cc
index 0f4e2ff9..650359f4 100644
--- a/lib/database.cc
+++ b/lib/database.cc
@@ -705,27 +705,51 @@ notmuch_database_compact (const char *path,
notmuch_compact_status_cb_t status_cb,
void *closure)
{
- void *local;
- char *notmuch_path, *xapian_path, *compact_xapian_path;
notmuch_status_t ret = NOTMUCH_STATUS_SUCCESS;
notmuch_database_t *notmuch = NULL;
- struct stat statbuf;
- bool keep_backup;
char *message = NULL;
- local = talloc_new (NULL);
- if (! local)
- return NOTMUCH_STATUS_OUT_OF_MEMORY;
-
ret = notmuch_database_open_verbose (path,
NOTMUCH_DATABASE_MODE_READ_WRITE,
¬much,
&message);
if (ret) {
if (status_cb) status_cb (message, closure);
- goto DONE;
+ return ret;
}
+ _notmuch_config_cache (notmuch, NOTMUCH_CONFIG_DATABASE_PATH, path);
+
+ return notmuch_database_compact_db (notmuch,
+ backup_path,
+ status_cb,
+ closure);
+}
+
+notmuch_status_t
+notmuch_database_compact_db (notmuch_database_t *notmuch,
+ const char *backup_path,
+ notmuch_compact_status_cb_t status_cb,
+ void *closure) {
+ void *local;
+ char *notmuch_path, *xapian_path, *compact_xapian_path;
+ const char* path;
+ notmuch_status_t ret = NOTMUCH_STATUS_SUCCESS;
+ struct stat statbuf;
+ bool keep_backup;
+
+ ret = _notmuch_database_ensure_writable (notmuch);
+ if (ret)
+ return ret;
+
+ path = notmuch_config_get (notmuch, NOTMUCH_CONFIG_DATABASE_PATH);
+ if (! path)
+ return NOTMUCH_STATUS_PATH_ERROR;
+
+ local = talloc_new (NULL);
+ 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;
diff --git a/lib/notmuch.h b/lib/notmuch.h
index b3346eb7..c1a1e45a 100644
--- a/lib/notmuch.h
+++ b/lib/notmuch.h
@@ -495,6 +495,18 @@ notmuch_database_compact (const char *path,
notmuch_compact_status_cb_t status_cb,
void *closure);
+/**
+ * Like notmuch_database_compact, but take an open database as a
+ * parameter.
+ *
+ * @since libnnotmuch 5.4 (notmuch 0.32)
+ */
+notmuch_status_t
+notmuch_database_compact_db (notmuch_database_t *database,
+ const char *backup_path,
+ notmuch_compact_status_cb_t status_cb,
+ void *closure);
+
/**
* Destroy the notmuch database, closing it if necessary and freeing
* all associated resources.
--
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 ` [PATCH 16/24] cli/reindex: convert " David Bremner
2020-12-25 0:42 ` [PATCH 17/24] CLI/reply: convert to " 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 ` David Bremner [this message]
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-24-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).