feed: optimize query for feeds, too

[public-inbox.git] / lib / PublicInbox / View.pm

diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm
index 60fc1df17f9e5e242d55a7f05a00ca2e7943c07e..8ac405f2b73cd78ce91b8e308738898694ac732b 100644 (file)
--- a/lib/PublicInbox/View.pm
+++ b/lib/PublicInbox/View.pm
@@ -409,7 +409,7 @@ sub thread_html {
        my $mid = $ctx->{mid};
        my $srch = $ctx->{srch};
        my $sres = $srch->get_thread($mid);
-       my $msgs = load_results($srch, $sres);
+       my $msgs = $sres->{msgs};
        my $nr = $sres->{total};
        return missing_thread($ctx) if $nr == 0;
        my $skel = '<hr><pre>';
@@ -680,7 +680,7 @@ sub thread_skel {
        $ctx->{prev_attr} = '';
        $ctx->{prev_level} = 0;
        $ctx->{dst} = $dst;
-       $sres = load_results($srch, $sres);
+       $sres = $sres->{msgs};
 
        # reduce hash lookups in skel_dump
        my $ibx = $ctx->{-inbox};
@@ -801,12 +801,6 @@ sub indent_for {
        $level ? INDENT x ($level - 1) : '';
 }
 
-sub load_results {
-       my ($srch, $sres) = @_;
-       my $msgs = delete $sres->{msgs};
-       $srch->retry_reopen(sub { [ map { $_->mid; $_ } @$msgs ] });
-}
-
 sub thread_results {
        my ($ctx, $msgs) = @_;
        require PublicInbox::SearchThread;
@@ -1069,28 +1063,13 @@ sub index_nav { # callback for WwwStream
 sub index_topics {
        my ($ctx) = @_;
        my ($off) = (($ctx->{qp}->{o} || '0') =~ /(\d+)/);
-       my $lim = 200;
-       my $opts = { offset => $off, limit => $lim };
 
        $ctx->{order} = [];
        my $srch = $ctx->{srch};
-
-       my $qs = '';
-       # this complicated bit cuts loading time by over 400ms on my system:
-       if ($off == 0) {
-               my ($min, $max) = $ctx->{-inbox}->mm->minmax;
-               my $n = $max - $lim;
-               $n = $min if $n < $min;
-               for (; $qs eq '' && $n >= $min; --$n) {
-                       my $smsg = $srch->lookup_article($n) or next;
-                       $qs = POSIX::strftime('d:%Y%m%d..', gmtime($smsg->ts));
-               }
-       }
-
-       my $sres = $srch->query($qs, $opts);
-       my $nr = scalar @{$sres->{msgs}};
+       my $sres = $ctx->{-inbox}->recent({offset => $off, limit => 200 });
+       $sres = $sres->{msgs};
+       my $nr = scalar @$sres;
        if ($nr) {
-               $sres = load_results($srch, $sres);
                walk_thread(thread_results($ctx, $sres), $ctx, *acc_topic);
        }
        $ctx->{-next_o} = $off + $nr;