gzip_filter: delay async wcb call

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

diff --git a/lib/PublicInbox/Mbox.pm b/lib/PublicInbox/Mbox.pm
index c8e4b406229e0e1e1abd96405ebf229d75d58982..4f84eea6745d5cbc08f835e64200ebe3ce44dd00 100644 (file)
--- a/lib/PublicInbox/Mbox.pm
+++ b/lib/PublicInbox/Mbox.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2015-2020 all contributors <meta@public-inbox.org>
+# Copyright (C) 2015-2021 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 
 # Streaming interface for mboxrd HTTP responses
@@ -47,7 +47,7 @@ sub async_eml { # for async_blob_cb
        $ctx->{smsg} = $ctx->{ibx}->over->next_by_mid(@{$ctx->{next_arg}});
 
        $ctx->zmore(msg_hdr($ctx, $eml));
-       $ctx->{http_out}->write($ctx->translate(msg_body($eml)));
+       $ctx->write(msg_body($eml));
 }
 
 sub res_hdr ($$) {
@@ -124,8 +124,9 @@ sub thread_cb {
                        return $smsg;
                }
                # refill result set
-               $ctx->{msgs} = $msgs = $ctx->{over}->get_thread($ctx->{mid},
-                                                               $ctx->{prev});
+               my $over = $ctx->{ibx}->over or return $ctx->gone('over');
+               $ctx->{msgs} = $msgs = $over->get_thread($ctx->{mid},
+                                                       $ctx->{prev});
                return unless @$msgs;
                $ctx->{prev} = $msgs->[-1];
        }
@@ -136,7 +137,6 @@ sub thread_mbox {
        my $msgs = $ctx->{msgs} = $over->get_thread($ctx->{mid}, {});
        return [404, [qw(Content-Type text/plain)], []] if !@$msgs;
        $ctx->{prev} = $msgs->[-1];
-       $ctx->{over} = $over; # bump refcnt
        require PublicInbox::MboxGz;
        PublicInbox::MboxGz::mbox_gz($ctx, \&thread_cb, $msgs->[0]->{subject});
 }
@@ -155,58 +155,53 @@ sub emit_range {
 
 sub all_ids_cb {
        my ($ctx) = @_;
+       my $over = $ctx->{ibx}->over or return $ctx->gone('over');
        my $ids = $ctx->{ids};
        do {
                while ((my $num = shift @$ids)) {
-                       my $smsg = $ctx->{over}->get_art($num) or next;
+                       my $smsg = $over->get_art($num) or next;
                        return $smsg;
                }
-               $ctx->{ids} = $ids = $ctx->{mm}->ids_after(\($ctx->{prev}));
+               $ctx->{ids} = $ids = $over->ids_after(\($ctx->{prev}));
        } while (@$ids);
 }
 
 sub mbox_all_ids {
        my ($ctx) = @_;
-       my $ibx = $ctx->{ibx};
        my $prev = 0;
-       my $mm = $ctx->{mm} = $ibx->mm;
-       my $ids = $mm->ids_after(\$prev) or return
-               [404, [qw(Content-Type text/plain)], ["No results found\n"]];
-       $ctx->{over} = $ibx->over or
+       my $over = $ctx->{ibx}->over or
                return PublicInbox::WWW::need($ctx, 'Overview');
+       my $ids = $over->ids_after(\$prev) or return
+               [404, [qw(Content-Type text/plain)], ["No results found\n"]];
        $ctx->{ids} = $ids;
        $ctx->{prev} = $prev;
+       $ctx->{-low_prio} = 1;
        require PublicInbox::MboxGz;
        PublicInbox::MboxGz::mbox_gz($ctx, \&all_ids_cb, 'all');
 }
 
-sub gone ($$) {
-       my ($ctx, $what) = @_;
-       warn "W: `$ctx->{ibx}->{inboxdir}' $what went away unexpectedly\n";
-       undef;
-}
-
 sub results_cb {
        my ($ctx) = @_;
-       my $over = $ctx->{ibx}->over or return gone($ctx, 'over');
+       my $over = $ctx->{ibx}->over or return $ctx->gone('over');
        while (1) {
                while (defined(my $num = shift(@{$ctx->{ids}}))) {
                        my $smsg = $over->get_art($num) or next;
                        return $smsg;
                }
-               # refill result set
-               my $srch = $ctx->{ibx}->isrch or return gone($ctx, 'search');
+               # refill result set, deprioritize since there's many results
+               my $srch = $ctx->{ibx}->isrch or return $ctx->gone('search');
                my $mset = $srch->mset($ctx->{query}, $ctx->{qopts});
                my $size = $mset->size or return;
                $ctx->{qopts}->{offset} += $size;
                $ctx->{ids} = $srch->mset_to_artnums($mset, $ctx->{qopts});
+               $ctx->{-low_prio} = 1;
        }
 }
 
 sub results_thread_cb {
        my ($ctx) = @_;
 
-       my $over = $ctx->{ibx}->over or return gone($ctx, 'over');
+       my $over = $ctx->{ibx}->over or return $ctx->gone('over');
        while (1) {
                while (defined(my $num = shift(@{$ctx->{xids}}))) {
                        my $smsg = $over->get_art($num) or next;
@@ -216,12 +211,13 @@ sub results_thread_cb {
                # refills ctx->{xids}
                next if $over->expand_thread($ctx);
 
-               # refill result set
-               my $srch = $ctx->{ibx}->isrch or return gone($ctx, 'search');
+               # refill result set, deprioritize since there's many results
+               my $srch = $ctx->{ibx}->isrch or return $ctx->gone('search');
                my $mset = $srch->mset($ctx->{query}, $ctx->{qopts});
                my $size = $mset->size or return;
                $ctx->{qopts}->{offset} += $size;
                $ctx->{ids} = $srch->mset_to_artnums($mset, $ctx->{qopts});
+               $ctx->{-low_prio} = 1;
        }
 
 }
@@ -235,8 +231,9 @@ sub mbox_all {
        my $over = $ctx->{ibx}->over or
                return PublicInbox::WWW::need($ctx, 'Overview');
 
-       my $qopts = $ctx->{qopts} = { mset => 2 }; # order by docid
-       $qopts->{thread} = 1 if $q->{t};
+       my $qopts = $ctx->{qopts} = { relevance => -2 }; # ORDER BY docid DESC
+       $qopts->{threads} = 1 if $q->{t};
+       $srch->query_approxidate($ctx->{ibx}->git, $q_string);
        my $mset = $srch->mset($q_string, $qopts);
        $qopts->{offset} = $mset->size or
                        return [404, [qw(Content-Type text/plain)],