From 107123dd03f38b97579ce5976f31ae3fd5f22903 Mon Sep 17 00:00:00 2001 From: "Eric Wong (Contractor, The Linux Foundation)" Date: Fri, 23 Mar 2018 02:03:46 +0000 Subject: search: reopen DB if each_smsg_by_mid fails This gives more-up-to-date data in case and allows us to avoid reopening in more places ourselves. --- lib/PublicInbox/Search.pm | 5 +++++ t/psgi_v2.t | 10 +++------- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/lib/PublicInbox/Search.pm b/lib/PublicInbox/Search.pm index 24600ee7..a4e2498e 100644 --- a/lib/PublicInbox/Search.pm +++ b/lib/PublicInbox/Search.pm @@ -417,6 +417,11 @@ sub each_smsg_by_mid { my $term = 'Q' . $mid; my $head = $db->postlist_begin($term); my $tail = $db->postlist_end($term); + if ($head == $tail) { + $db->reopen; + $head = $db->postlist_begin($term); + $tail = $db->postlist_end($term); + } return ($head, $tail, $db) if wantarray; for (; $head->nequal($tail); $head->inc) { my $doc_id = $head->get_docid; diff --git a/t/psgi_v2.t b/t/psgi_v2.t index 5d089dbe..6a2ea5ba 100644 --- a/t/psgi_v2.t +++ b/t/psgi_v2.t @@ -50,12 +50,11 @@ $new_mid = PublicInbox::MID::mid_clean($mids[0]); $im->done; my $cfgpfx = "publicinbox.v2test"; -my %cfg = ( +my $cfg = { "$cfgpfx.address" => $ibx->{-primary_address}, "$cfgpfx.mainrepo" => $mainrepo, -); - -my $config = PublicInbox::Config->new({ %cfg }); +}; +my $config = PublicInbox::Config->new($cfg); my $www = PublicInbox::WWW->new($config); my ($res, $raw, @from_); test_psgi(sub { $www->call(@_) }, sub { @@ -85,9 +84,6 @@ is($warn[0], $warn[1], 'both warnings are the same'); my $third = PublicInbox::MID::mid_clean($mids[0]); $im->done; -# need to reload... -$config = PublicInbox::Config->new({ %cfg }); -$www = PublicInbox::WWW->new($config); test_psgi(sub { $www->call(@_) }, sub { my ($cb) = @_; $res = $cb->(GET("/v2test/$third/raw")); -- cgit v1.2.3-24-ge0c7