[PATCH 11/11] lib: Remove unnecessary thread linking steps when using ghost messages
From: Austin Clements
Previously, it was necessary to link new messages to children to work
around some (though not all) problems with the old metadata-based
approach to stored thread IDs. With ghost messages, this is no longer
necessary, so don't bother with child linking when ghost messages are
in use.
---
lib/database.cc | 21 +
1 file changed, 17 insertions(+), 4 deletions(-)
diff --git a/lib/database.cc b/lib/database.cc
index ff6a7f6..4655f59 100644
--- a/lib/database.cc
+++ b/lib/database.cc
@@ -2167,10 +2167,23 @@ _notmuch_database_link_message (notmuch_database_t
*notmuch,
if (status)
goto DONE;
-status = _notmuch_database_link_message_to_children (notmuch, message,
-&thread_id);
-if (status)
- goto DONE;
+if (! (notmuch->features & NOTMUCH_FEATURE_GHOSTS)) {
+ /* In general, it shouldn't be necessary to link children,
+* since the earlier indexing of those children will have
+* stored a thread ID for the missing parent. However, prior
+* to ghost messages, these stored thread IDs were NOT
+* rewritten during thread merging (and there was no
+* performant way to do so), so if indexed children were
+* pulled into a different thread ID by a merge, it was
+* necessary to pull them *back* into the stored thread ID of
+* the parent. With ghost messages, we just rewrite the
+* stored thread IDs during merging, so this workaround isn't
+* necessary. */
+ status = _notmuch_database_link_message_to_children (notmuch, message,
+&thread_id);
+ if (status)
+ goto DONE;
+}
/* If not part of any existing thread, generate a new thread ID. */
if (thread_id == NULL) {
--
2.1.0
[PATCH 11/11] lib: Remove unnecessary thread linking steps when using ghost messages
From: Austin Clements
Previously, it was necessary to link new messages to children to work
around some (though not all) problems with the old metadata-based
approach to stored thread IDs. With ghost messages, this is no longer
necessary, so don't bother with child linking when ghost messages are
in use.
---
lib/database.cc | 21 +
1 file changed, 17 insertions(+), 4 deletions(-)
diff --git a/lib/database.cc b/lib/database.cc
index ff6a7f6..4655f59 100644
--- a/lib/database.cc
+++ b/lib/database.cc
@@ -2167,10 +2167,23 @@ _notmuch_database_link_message (notmuch_database_t
*notmuch,
if (status)
goto DONE;
-status = _notmuch_database_link_message_to_children (notmuch, message,
-&thread_id);
-if (status)
- goto DONE;
+if (! (notmuch->features & NOTMUCH_FEATURE_GHOSTS)) {
+ /* In general, it shouldn't be necessary to link children,
+* since the earlier indexing of those children will have
+* stored a thread ID for the missing parent. However, prior
+* to ghost messages, these stored thread IDs were NOT
+* rewritten during thread merging (and there was no
+* performant way to do so), so if indexed children were
+* pulled into a different thread ID by a merge, it was
+* necessary to pull them *back* into the stored thread ID of
+* the parent. With ghost messages, we just rewrite the
+* stored thread IDs during merging, so this workaround isn't
+* necessary. */
+ status = _notmuch_database_link_message_to_children (notmuch, message,
+&thread_id);
+ if (status)
+ goto DONE;
+}
/* If not part of any existing thread, generate a new thread ID. */
if (thread_id == NULL) {
--
2.1.0
___
notmuch mailing list
notmuch@notmuchmail.org
http://notmuchmail.org/mailman/listinfo/notmuch
