From: David Bremner <david@tethera.net>
To: notmuch@notmuchmail.org
Cc: David Bremner <david@tethera.net>
Subject: [PATCH 10/10] lib: fix return value for n_m_reindex
Date: Wed, 8 Jul 2020 21:17:09 -0300 [thread overview]
Message-ID: <20200709001709.449217-11-david@tethera.net> (raw)
In-Reply-To: <20200709001709.449217-1-david@tethera.net>
Also update the documentation for the behaviour of n_m_get_thread_id
that this fix relies on.
---
lib/message.cc | 6 ++++--
lib/notmuch.h | 4 ++--
test/T560-lib-error.sh | 1 -
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/lib/message.cc b/lib/message.cc
index 09708ed9..87448101 100644
--- a/lib/message.cc
+++ b/lib/message.cc
@@ -2205,8 +2205,10 @@ notmuch_message_reindex (notmuch_message_t *message,
/* Save in case we need to delete message */
orig_thread_id = notmuch_message_get_thread_id (message);
if (! orig_thread_id) {
- /* XXX TODO: make up new error return? */
- INTERNAL_ERROR ("message without thread-id");
+ /* the following is correct as long as there is only one reason
+ n_m_get_thread_id returns NULL
+ */
+ return NOTMUCH_STATUS_XAPIAN_EXCEPTION;
}
/* strdup it because the metadata may be invalidated */
diff --git a/lib/notmuch.h b/lib/notmuch.h
index 9a19e2f7..97ebc17d 100644
--- a/lib/notmuch.h
+++ b/lib/notmuch.h
@@ -1378,8 +1378,8 @@ notmuch_message_get_message_id (notmuch_message_t *message);
* notmuch_message_destroy on 'message' or until a query from which it
* derived is destroyed).
*
- * This function will not return NULL since Notmuch ensures that every
- * message belongs to a single thread.
+ * This function will return NULL if triggers an unhandled Xapian
+ * exception.
*/
const char *
notmuch_message_get_thread_id (notmuch_message_t *message);
diff --git a/test/T560-lib-error.sh b/test/T560-lib-error.sh
index e303720c..536ff701 100755
--- a/test/T560-lib-error.sh
+++ b/test/T560-lib-error.sh
@@ -679,7 +679,6 @@ EOF
test_expect_equal_file EXPECTED OUTPUT
test_begin_subtest "Handle reindexing message with closed db"
-test_subtest_known_broken
cat c_head2 - c_tail <<'EOF' | test_C ${MAIL_DIR}
{
notmuch_status_t status;
--
2.27.0
next prev parent reply other threads:[~2020-07-09 0:26 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-09 0:16 fourth batch of API cleanup for exception handling David Bremner
2020-07-09 0:17 ` [PATCH 01/10] test: add regression test for notmuch_message_has_maildir_flag David Bremner
2020-07-09 0:17 ` [PATCH 02/10] lib: add notmuch_message_has_maildir_flag_st David Bremner
2020-07-09 0:17 ` [PATCH 03/10] test: add regression test for n_m_maildir_flags_to_tags David Bremner
2020-07-09 0:17 ` [PATCH 04/10] test: add broken test for n_m_remove_all_tags David Bremner
2020-07-09 0:17 ` [PATCH 05/10] lib: handle xapian exception in n_m_remove_all_tags David Bremner
2020-07-09 0:17 ` [PATCH 06/10] test: regression tests of n_m_freeze and n_m_thaw on closed db David Bremner
2020-07-09 0:17 ` [PATCH 07/10] test: regression test for destroying message with " David Bremner
2020-07-09 0:17 ` [PATCH 08/10] test: regression for retrieving closed db from message David Bremner
2020-07-09 0:17 ` [PATCH 09/10] test: add known broken test for n_m_reindex on closed db David Bremner
2020-07-09 0:17 ` David Bremner [this message]
2020-07-20 12:14 ` fourth batch of API cleanup for exception handling 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=20200709001709.449217-11-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).