From: Tomi Ollila <tomi.ollila@iki.fi>
To: David Bremner <david@tethera.net>, notmuch@notmuchmail.org
Subject: Re: [PATCH 06/15] lib/thread: refactor in_reply_to test
Date: Sat, 01 Sep 2018 23:02:09 +0300 [thread overview]
Message-ID: <m2pnxxgf5q.fsf@guru.guru-group.fi> (raw)
In-Reply-To: <20180830112915.11761-7-david@tethera.net>
On Thu, Aug 30 2018, David Bremner wrote:
> This is not a complete win in code-size, but it makes the code (which
> is about to get more complicated) easier to follow.
> ---
> lib/thread.cc | 42 +++++++++++++++++++++++++-----------------
> 1 file changed, 25 insertions(+), 17 deletions(-)
>
> diff --git a/lib/thread.cc b/lib/thread.cc
> index b599a97d..8074b625 100644
> --- a/lib/thread.cc
> +++ b/lib/thread.cc
> @@ -387,12 +387,31 @@ _thread_add_matched_message (notmuch_thread_t *thread,
> _thread_add_matched_author (thread, _notmuch_message_get_author (hashed_message));
> }
>
> +static bool
> +_parent_via_in_reply_to (notmuch_thread_t *thread, notmuch_message_t *message) {
> + notmuch_message_t *parent;
> + const char *in_reply_to;
> +
> + in_reply_to = _notmuch_message_get_in_reply_to (message);
> + DEBUG_PRINTF("checking message = %s in_reply_to=%s\n",
> + notmuch_message_get_message_id (message), in_reply_to);
> +
> + if (in_reply_to && strlen (in_reply_to) &&
This is a code move, but did we already have a macro/inline function
to check when string is non-empty (or empty) -- expanding to (string[0])
strlen(string_with_million_nonzero_octets) just to check that string
is not empty is not necessarily a smart move...
e.g. something like:
static inline bool empty_string(const char * string)
{
return string[0] == '\0';
}
or #define EMPTY_STRING(string) ((string)[0] == '\0')
(or the opposite versions, which I would have presented, but naming is hard)
> + g_hash_table_lookup_extended (thread->message_hash,
> + in_reply_to, NULL,
> + (void **) &parent)) {
> + _notmuch_message_add_reply (parent, message);
> + return true;
> + } else {
> + return false;
> + }
> +}
> +
> static void
> _resolve_thread_relationships (notmuch_thread_t *thread)
> {
> notmuch_message_node_t *node, *first_node;
> - notmuch_message_t *message, *parent;
> - const char *in_reply_to;
> + notmuch_message_t *message;
>
> first_node = thread->message_list->head;
> if (! first_node)
> @@ -400,13 +419,7 @@ _resolve_thread_relationships (notmuch_thread_t *thread)
>
> for (node = first_node->next; node; node = node->next) {
> message = node->message;
> - in_reply_to = _notmuch_message_get_in_reply_to (message);
> - if (in_reply_to && strlen (in_reply_to) &&
> - g_hash_table_lookup_extended (thread->message_hash,
> - in_reply_to, NULL,
> - (void **) &parent))
> - _notmuch_message_add_reply (parent, message);
> - else
> + if (! _parent_via_in_reply_to (thread, message))
> _notmuch_message_list_add_message (thread->toplevel_list, message);
> }
>
> @@ -418,15 +431,10 @@ _resolve_thread_relationships (notmuch_thread_t *thread)
> */
> if (first_node) {
> message = first_node->message;
> - in_reply_to = _notmuch_message_get_in_reply_to (message);
> - if (thread->toplevel_list->head &&
> - in_reply_to && strlen (in_reply_to) &&
> - g_hash_table_lookup_extended (thread->message_hash,
> - in_reply_to, NULL,
> - (void **) &parent))
> - _notmuch_message_add_reply (parent, message);
> - else
> + if (! thread->toplevel_list->head ||
> + ! _parent_via_in_reply_to (thread, message)) {
> _notmuch_message_list_add_message (thread->toplevel_list, message);
> + }
> }
>
> /* XXX this could be made conditional on messages being inserted
> --
> 2.18.0
>
> _______________________________________________
> notmuch mailing list
> notmuch@notmuchmail.org
> https://notmuchmail.org/mailman/listinfo/notmuch
next prev parent reply other threads:[~2018-09-01 20:02 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-30 11:29 threading replies fixes v3 David Bremner
2018-08-30 11:29 ` [PATCH 01/15] util: add DEBUG_PRINTF, rename error_util.h -> debug_print.h David Bremner
2018-09-01 17:06 ` Tomi Ollila
2018-09-03 11:54 ` David Bremner
2018-08-30 11:29 ` [PATCH 02/15] test: start threading test corpus David Bremner
2018-08-30 11:29 ` [PATCH 03/15] test: add known broken tests for "ghost roots" David Bremner
2018-08-30 11:29 ` [PATCH 04/15] lib/thread: sort sibling messages by date David Bremner
2018-09-01 17:11 ` Tomi Ollila
2018-09-03 15:18 ` David Bremner
2018-08-30 11:29 ` [PATCH 05/15] lib: read reference terms into message struct David Bremner
2018-08-30 11:29 ` [PATCH 06/15] lib/thread: refactor in_reply_to test David Bremner
2018-09-01 20:02 ` Tomi Ollila [this message]
2018-08-30 11:29 ` [PATCH 07/15] lib/thread: initial use of references as for fallback parenting David Bremner
2018-08-30 11:29 ` [PATCH 08/15] lib: calculate message depth in thread David Bremner
2018-08-30 11:29 ` [PATCH 09/15] lib/thread: rewrite _parent_or_toplevel to use depths David Bremner
2018-08-30 11:29 ` [PATCH 10/15] lib/thread: change _resolve_thread_relationships " David Bremner
2018-08-30 11:29 ` [PATCH 11/15] test: add known broken test for good In-Reply-To / bad References David Bremner
2018-08-30 11:29 ` [PATCH 12/15] test/thread-replies: mangle In-Reply-To's David Bremner
2018-08-30 11:29 ` [PATCH 13/15] util/string-util: export skip_space David Bremner
2018-08-30 11:29 ` [PATCH 14/15] lib: add _notmuch_message_id_parse_strict David Bremner
2018-09-01 20:27 ` Tomi Ollila
2018-08-30 11:29 ` [PATCH 15/15] lib: change parent strategy to use In-Reply-To if it looks sane David Bremner
2018-09-01 20:29 ` Tomi Ollila
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=m2pnxxgf5q.fsf@guru.guru-group.fi \
--to=tomi.ollila@iki.fi \
--cc=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).