dumping ground for random patches and texts
 help / color / mirror / Atom feed
From: Eric Wong <e@80x24.org>
To: spew@80x24.org
Subject: [PATCH 13/13] thread: fix sorting without topmost
Date: Wed,  5 Oct 2016 01:47:02 +0000	[thread overview]
Message-ID: <20161005014702.12626-14-e@80x24.org> (raw)
In-Reply-To: <20161005014702.12626-1-e@80x24.org>

This bug was hidden, and we may not be able to efficiently
implement a topmost subroutine with the hash-based (vs
linked-list) based container for threading in the next
commit.
---
 lib/PublicInbox/SearchView.pm | 5 ++---
 lib/PublicInbox/View.pm       | 4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/lib/PublicInbox/SearchView.pm b/lib/PublicInbox/SearchView.pm
index ebeb41f..cfe6dff 100644
--- a/lib/PublicInbox/SearchView.pm
+++ b/lib/PublicInbox/SearchView.pm
@@ -155,9 +155,8 @@ sub mset_thread {
 	$th->thread;
 	if ($q->{r}) { # order by relevance
 		$th->order(sub {
-			[ sort { (eval { $pct{$b->topmost->{id}} } || 0)
-					<=>
-				(eval { $pct{$a->topmost->{id}} } || 0)
+			[ sort { ( $pct{$b->{id}} || 0) <=>
+				 ( $pct{$a->{id}} || 0)
 			} @{$_[0]} ];
 		});
 	} else { # order by time (default for threaded view)
diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm
index 7554d54..c09b4a2 100644
--- a/lib/PublicInbox/View.pm
+++ b/lib/PublicInbox/View.pm
@@ -857,8 +857,8 @@ sub skel_dump {
 
 sub sort_ts {
 	[ sort {
-		(eval { $a->topmost->{smsg}->ts } || 0) <=>
-		(eval { $b->topmost->{smsg}->ts } || 0)
+		(eval { $a->{smsg}->ts } || 0) <=>
+		(eval { $b->{smsg}->ts } || 0)
 	} @{$_[0]} ];
 }
 
-- 
EW


      parent reply	other threads:[~2016-10-05  1:48 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-10-05  1:46 [WIP 0/13] mail threading speedups Eric Wong
2016-10-05  1:46 ` [PATCH 01/13] view: remove "subject dummy" references Eric Wong
2016-10-05  1:46 ` [PATCH 02/13] thread: remove Mail::Thread dependency Eric Wong
2016-10-05  1:46 ` [PATCH 03/13] thread: pass array refs instead of entire arrays Eric Wong
2016-10-05  1:46 ` [PATCH 04/13] thread: remove accessor usage in internals Eric Wong
2016-10-05  1:46 ` [PATCH 05/13] inbox: ghost smsg Eric Wong
2016-10-05  1:46 ` [PATCH 06/13] thread: remove Email::Abstract wrapping Eric Wong
2016-10-05  1:46 ` [PATCH 07/13] thread: remove rootset accessor method Eric Wong
2016-10-05  1:46 ` [PATCH 08/13] thread: simplify Eric Wong
2016-10-05  1:46 ` [PATCH 09/13] thread: remove iterate_down Eric Wong
2016-10-05  1:46 ` [PATCH 10/13] thread: avoid incrementing undefined value Eric Wong
2016-10-05  1:47 ` [PATCH 11/13] thread: order_children no longer cares about depth Eric Wong
2016-10-05  1:47 ` [PATCH 12/13] thread: inline and remove recurse_down logic Eric Wong
2016-10-05  1:47 ` Eric Wong [this message]

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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20161005014702.12626-14-e@80x24.org \
    --to=e@80x24.org \
    --cc=spew@80x24.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.
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).