rename reference to git epochs as "partitions"

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

diff --git a/lib/PublicInbox/Mbox.pm b/lib/PublicInbox/Mbox.pm
index c5e1cb9c570be0e2230d72c1cb9c94bba748ce38..15200d3ae1f4aba6ade7fcef61800726cc73cd55 100644 (file)
--- a/lib/PublicInbox/Mbox.pm
+++ b/lib/PublicInbox/Mbox.pm
@@ -1,8 +1,12 @@
 # Copyright (C) 2015-2018 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 
-# Streaming interface for formatting messages as an mboxrd.
-# Used by the web interface
+# Streaming (via getline) interface for formatting messages as an mboxrd.
+# Used by the PSGI web interface.
+#
+# public-inbox-httpd favors "getline" response bodies to take a
+# "pull"-based approach to feeding slow clients (as opposed to a
+# more common "push" model)
 package PublicInbox::Mbox;
 use strict;
 use warnings;
@@ -34,19 +38,17 @@ sub mb_stream {
 # called by PSGI server as body response
 sub getline {
        my ($more) = @_; # self
-       my ($ctx, $head, $tail, $db, $cur) = @$more;
-       if ($cur) {
+       my ($ctx, $id, $prev, $next, $cur) = @$more;
+       if ($cur) { # first
                pop @$more;
                return msg_str($ctx, $cur);
        }
-       for (; !defined($cur) && $head != $tail; $head++) {
-               my $smsg = PublicInbox::SearchMsg->get($head, $db, $ctx->{mid});
-               my $mref = $ctx->{-inbox}->msg_by_smsg($smsg) or next;
-               $cur = Email::Simple->new($mref);
-               $cur = msg_str($ctx, $cur);
-       }
-       $more->[1] = $head;
-       $cur;
+       $cur = $next or return;
+       my $ibx = $ctx->{-inbox};
+       $next = $ibx->over->next_by_mid($ctx->{mid}, \$id, \$prev);
+       @$more = ($ctx, $id, $prev, $next); # $next may be undef, here
+       my $mref = $ibx->msg_by_smsg($cur) or return;
+       msg_str($ctx, Email::Simple->new($mref));
 }
 
 sub close {} # noop
@@ -57,21 +59,14 @@ sub emit_raw {
        my $ibx = $ctx->{-inbox};
        my $first;
        my $more;
-       my ($head, $tail, $db);
-       my %seen;
-       if (my $srch = $ibx->search) {
-               $srch->retry_reopen(sub {
-                       ($head, $tail, $db) = $srch->each_smsg_by_mid($mid);
-                       for (; !defined($first) && $head != $tail; $head++) {
-                               my @args = ($head, $db, $mid);
-                               my $smsg = PublicInbox::SearchMsg->get(@args);
-                               my $mref = $ibx->msg_by_smsg($smsg) or next;
-                               $first = Email::Simple->new($mref);
-                       }
-                       if ($head != $tail) {
-                               $more = [ $ctx, $head, $tail, $db, $first ];
-                       }
-               });
+       if (my $over = $ibx->over) {
+               my ($id, $prev);
+               my $smsg = $over->next_by_mid($mid, \$id, \$prev) or return;
+               my $mref = $ibx->msg_by_smsg($smsg) or return;
+               $first = Email::Simple->new($mref);
+               my $next = $over->next_by_mid($mid, \$id, \$prev);
+               # $more is for ->getline
+               $more = [ $ctx, $id, $prev, $next, $first ] if $next;
        } else {
                my $mref = $ibx->msg_by_mid($mid) or return;
                $first = Email::Simple->new($mref);
@@ -135,13 +130,13 @@ sub msg_str {
 }
 
 sub thread_mbox {
-       my ($ctx, $srch, $sfx) = @_;
+       my ($ctx, $over, $sfx) = @_;
        eval { require IO::Compress::Gzip };
        return sub { need_gzip(@_) } if $@;
        my $mid = $ctx->{mid};
-       my $msgs = $srch->get_thread($mid, 0);
+       my $msgs = $over->get_thread($mid, {});
        return [404, [qw(Content-Type text/plain)], []] if !@$msgs;
-       my $prev = $msgs->[-1]->{num};
+       my $prev = $msgs->[-1];
        my $i = 0;
        my $cb = sub {
                while (1) {
@@ -149,9 +144,9 @@ sub thread_mbox {
                                return $smsg;
                        }
                        # refill result set
-                       $msgs = $srch->get_thread($mid, $prev);
+                       $msgs = $over->get_thread($mid, $prev);
                        return unless @$msgs;
-                       $prev = $msgs->[-1]->{num};
+                       $prev = $msgs->[-1];
                        $i = 0;
                }
        };
@@ -173,17 +168,19 @@ sub emit_range {
 sub mbox_all_ids {
        my ($ctx) = @_;
        my $prev = 0;
-       my $ids = $ctx->{-inbox}->mm->ids_after(\$prev) or return
+       my $ibx = $ctx->{-inbox};
+       my $ids = $ibx->mm->ids_after(\$prev) or return
                [404, [qw(Content-Type text/plain)], ["No results found\n"]];
        my $i = 0;
-       my $over = $ctx->{srch}->{over_ro};
+       my $over = $ibx->over or
+               return PublicInbox::WWW::need($ctx, 'Overview');
        my $cb = sub {
                do {
                        while ((my $num = $ids->[$i++])) {
                                my $smsg = $over->get_art($num) or next;
                                return $smsg;
                        }
-                       $ids = $ctx->{-inbox}->mm->ids_after(\$prev);
+                       $ids = $ibx->mm->ids_after(\$prev);
                        $i = 0;
                } while (@$ids);
                undef;
@@ -198,7 +195,8 @@ sub mbox_all {
        return sub { need_gzip(@_) } if $@;
        return mbox_all_ids($ctx) if $query eq '';
        my $opts = { mset => 2 };
-       my $srch = $ctx->{srch};
+       my $srch = $ctx->{-inbox}->search or
+               return PublicInbox::WWW::need($ctx, 'Search');;
        my $mset = $srch->query($query, $opts);
        $opts->{offset} = $mset->size or
                        return [404, [qw(Content-Type text/plain)],