search: retry_reopen passes user arg to callback

This allows callers to pass named (not anonymous) subs.

Update all retry_reopen callers to use this feature, and
fix some places where we failed to use retry_reopen :x

diff --git a/lib/PublicInbox/ExtMsg.pm b/lib/PublicInbox/ExtMsg.pm
index 0138d373cbea417d9318eaf974ade6745c983b9e..0f3e392defcf09cf2aa453001268b22e867adc6a 100644 (file)
--- a/lib/PublicInbox/ExtMsg.pm
+++ b/lib/PublicInbox/ExtMsg.pm
@@ -29,6 +29,10 @@ our @EXT_URL = map { ascii_html($_) } (
 
 sub PARTIAL_MAX () { 100 }
 
+sub mids_from_mset { # Search::retry_reopen callback
+       [ map { PublicInbox::SearchMsg::from_mitem($_)->mid } $_[0]->items ];
+}
+
 sub search_partial ($$) {
        my ($srch, $mid) = @_;
        return if length($mid) < $MIN_PARTIAL_LEN;
@@ -65,12 +69,8 @@ sub search_partial ($$) {
                # Search::Xapian::QueryParserError or even:
                # "something terrible happened at ../Search/Xapian/Enquire.pm"
                my $mset = eval { $srch->query($m, $opt) } or next;
-
-               my @mids = map {
-                       my $doc = $_->get_document;
-                       PublicInbox::SearchMsg->load_doc($doc)->mid;
-               } $mset->items;
-               return \@mids if scalar(@mids);
+               my $mids = $srch->retry_reopen(\&mids_from_mset, $mset);
+               return $mids if scalar(@$mids);
        }
 }
 

diff --git a/lib/PublicInbox/Mbox.pm b/lib/PublicInbox/Mbox.pm
index 3fdda5eaa8100f0435ce8b8f1a4f4612f9fe8204..1f9ac6ec88cfd1a0989a0da5f7d44ab8590230cd 100644 (file)
--- a/lib/PublicInbox/Mbox.pm
+++ b/lib/PublicInbox/Mbox.pm
@@ -12,6 +12,7 @@ use strict;
 use warnings;
 use PublicInbox::MID qw/mid_escape/;
 use PublicInbox::Hval qw/to_filename/;
+use PublicInbox::SearchMsg;
 use Email::Simple;
 use Email::MIME::Encode;
 
@@ -204,10 +205,8 @@ sub results_cb {
        my $srch = $ctx->{srch};
        while (1) {
                while (my $mi = (($mset->items)[$ctx->{iter}++])) {
-                       my $doc = $mi->get_document;
-                       my $smsg = $srch->retry_reopen(sub {
-                               PublicInbox::SearchMsg->load_doc($doc);
-                       }) or next;
+                       my $smsg = PublicInbox::SearchMsg::from_mitem($mi,
+                                                               $srch) or next;
                        return $smsg;
                }
                # refill result set

diff --git a/lib/PublicInbox/Search.pm b/lib/PublicInbox/Search.pm
index 65c6ee831925cd225a74ead0dfdcba426fa1b4a5..eb1a1446b6f10f4552431f99253d87f2608f06be 100644 (file)
--- a/lib/PublicInbox/Search.pm
+++ b/lib/PublicInbox/Search.pm
@@ -231,15 +231,15 @@ sub query {
 }
 
 sub retry_reopen {
-       my ($self, $cb) = @_;
+       my ($self, $cb, $arg) = @_;
        for my $i (1..10) {
                if (wantarray) {
                        my @ret;
-                       eval { @ret = $cb->() };
+                       eval { @ret = $cb->($arg) };
                        return @ret unless $@;
                } else {
                        my $ret;
-                       eval { $ret = $cb->() };
+                       eval { $ret = $cb->($arg) };
                        return $ret unless $@;
                }
                # Exception: The revision being read has been discarded -
@@ -259,11 +259,11 @@ sub retry_reopen {
 
 sub _do_enquire {
        my ($self, $query, $opts) = @_;
-       retry_reopen($self, sub { _enquire_once($self, $query, $opts) });
+       retry_reopen($self, \&_enquire_once, [ $self, $query, $opts ]);
 }
 
-sub _enquire_once {
-       my ($self, $query, $opts) = @_;
+sub _enquire_once { # retry_reopen callback
+       my ($self, $query, $opts) = @{$_[0]};
        my $xdb = xdb($self);
        my $enquire = $X{Enquire}->new($xdb);
        $enquire->set_query($query);
@@ -281,9 +281,7 @@ sub _enquire_once {
        my $limit = $opts->{limit} || 50;
        my $mset = $enquire->get_mset($offset, $limit);
        return $mset if $opts->{mset};
-       my @msgs = map {
-               PublicInbox::SearchMsg->load_doc($_->get_document);
-       } $mset->items;
+       my @msgs = map { PublicInbox::SearchMsg::from_mitem($_) } $mset->items;
        return \@msgs unless wantarray;
 
        ($mset->get_matches_estimated, \@msgs)

diff --git a/lib/PublicInbox/SearchMsg.pm b/lib/PublicInbox/SearchMsg.pm
index 53882f73029c2c2712b69513b8820aa2c069b855..ea54ba8a9487c30c8ead25dc94a28b73654c2c45 100644 (file)
--- a/lib/PublicInbox/SearchMsg.pm
+++ b/lib/PublicInbox/SearchMsg.pm
@@ -92,10 +92,11 @@ sub psgi_cull ($) {
 }
 
 # Only called by PSGI interface, not NNTP
-sub load_doc {
-       my ($class, $doc) = @_;
-       my $self = bless {}, $class;
-       psgi_cull(load_expand($self, $doc));
+sub from_mitem {
+       my ($mitem, $srch) = @_;
+       return $srch->retry_reopen(\&from_mitem, $mitem) if $srch;
+       my $self = bless {}, __PACKAGE__;
+       psgi_cull(load_expand($self, $mitem->get_document));
 }
 
 # :bytes and :lines metadata in RFC 3977

diff --git a/lib/PublicInbox/SearchView.pm b/lib/PublicInbox/SearchView.pm
index 8cffdedbb33a27dce981fd4d503776de75c1b62d..6587d37fb9f94011e955ada6cb6139172cddd398 100644 (file)
--- a/lib/PublicInbox/SearchView.pm
+++ b/lib/PublicInbox/SearchView.pm
@@ -88,17 +88,6 @@ retry:
        PublicInbox::WwwStream->response($ctx, $code, $cb);
 }
 
-# allow undef for individual doc loads...
-sub load_doc_retry {
-       my ($srch, $mitem) = @_;
-
-       eval {
-               $srch->retry_reopen(sub {
-                       PublicInbox::SearchMsg->load_doc($mitem->get_document)
-               });
-       }
-}
-
 # display non-nested search results similar to what users expect from
 # regular WWW search engines:
 sub mset_summary {
@@ -114,7 +103,7 @@ sub mset_summary {
        foreach my $m ($mset->items) {
                my $rank = sprintf("%${pad}d", $m->get_rank + 1);
                my $pct = get_pct($m);
-               my $smsg = load_doc_retry($srch, $m);
+               my $smsg = PublicInbox::SearchMsg::from_mitem($m, $srch);
                unless ($smsg) {
                        eval {
                                $m = "$m ".$m->get_docid . " expired\n";
@@ -270,14 +259,19 @@ sub get_pct ($) {
        $n > 99 ? 99 : $n;
 }
 
+sub load_msgs {
+       my ($mset) = @_;
+       [ map {
+               my $mi = $_;
+               my $smsg = PublicInbox::SearchMsg::from_mitem($mi);
+               $smsg->{pct} = get_pct($mi);
+               $smsg;
+       } ($mset->items) ]
+}
+
 sub mset_thread {
        my ($ctx, $mset, $q) = @_;
-       my $msgs = $ctx->{-inbox}->search->retry_reopen(sub { [ map {
-               my $i = $_;
-               my $smsg = PublicInbox::SearchMsg->load_doc($i->get_document);
-               $smsg->{pct} = get_pct($i);
-               $smsg;
-       } ($mset->items) ]});
+       my $msgs = $ctx->{-inbox}->search->retry_reopen(\&load_msgs, $mset);
        my $r = $q->{r};
        my $rootset = PublicInbox::SearchThread::thread($msgs,
                $r ? \&sort_relevance : \&PublicInbox::View::sort_ds,
@@ -345,7 +339,9 @@ sub adump {
 sub adump_i {
        my ($ctx) = @_;
        while (my $mi = shift @{$ctx->{items}}) {
-               my $smsg = load_doc_retry($ctx->{srch}, $mi) or next;
+               my $smsg = eval {
+                       PublicInbox::SearchMsg::from_mitem($mi, $ctx->{srch});
+               } or next;
                $ctx->{-inbox}->smsg_mime($smsg) and return $smsg;
        }
 }