From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-4.0 required=3.0 tests=ALL_TRUSTED,BAYES_00 shortcircuit=no autolearn=ham autolearn_force=no version=3.4.0 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id F0AC71F404 for ; Thu, 29 Mar 2018 19:14:12 +0000 (UTC) From: "Eric Wong (Contractor, The Linux Foundation)" To: meta@public-inbox.org Subject: [PATCH] search: retry_reopen on first_smsg_by_mid Date: Thu, 29 Mar 2018 19:14:12 +0000 Message-Id: <20180329191412.22692-1-e@80x24.org> List-Id: This was causing errors while attempting to load messages via the WWW interface while mass-importing LKML. While we're at it, remove unnecessary eval from lookup_article. --- lib/PublicInbox/Search.pm | 46 ++++++++++++++++++++++------------------------ 1 file changed, 22 insertions(+), 24 deletions(-) diff --git a/lib/PublicInbox/Search.pm b/lib/PublicInbox/Search.pm index 6f5e062..5fc7682 100644 --- a/lib/PublicInbox/Search.pm +++ b/lib/PublicInbox/Search.pm @@ -348,36 +348,34 @@ sub query_ts { sub first_smsg_by_mid { my ($self, $mid) = @_; my $smsg; - each_smsg_by_mid($self, $mid, sub { $smsg = $_[0]; undef }); + retry_reopen($self, sub { + each_smsg_by_mid($self, $mid, sub { $smsg = $_[0]; undef }); + }); $smsg; } sub lookup_article { my ($self, $num) = @_; my $term = 'XNUM'.$num; - my $smsg; - eval { - retry_reopen($self, sub { - my $db = $self->{skel} || $self->{xdb}; - my $head = $db->postlist_begin($term); - my $tail = $db->postlist_end($term); - return if $head->equal($tail); - my $doc_id = $head->get_docid; - return unless defined $doc_id; - $head->inc; - if ($head->nequal($tail)) { - my $loc= $self->{mainrepo} . - ($self->{skel} ? 'skel' : 'xdb'); - warn "article #$num is not unique in $loc\n"; - } - # raises on error: - my $doc = $db->get_document($doc_id); - $smsg = PublicInbox::SearchMsg->wrap($doc); - $smsg->load_expand; - $smsg->{doc_id} = $doc_id; - }); - }; - $smsg; + my $db = $self->{skel} || $self->{xdb}; + retry_reopen($self, sub { + my $head = $db->postlist_begin($term); + my $tail = $db->postlist_end($term); + return if $head->equal($tail); + my $doc_id = $head->get_docid; + return unless defined $doc_id; + $head->inc; + if ($head->nequal($tail)) { + my $loc= $self->{mainrepo} . + ($self->{skel} ? 'skel' : 'xdb'); + warn "article #$num is not unique in $loc\n"; + } + # raises on error: + my $doc = $db->get_document($doc_id); + my $smsg = PublicInbox::SearchMsg->wrap($doc); + $smsg->{doc_id} = $doc_id; + $smsg->load_expand; + }); } sub each_smsg_by_mid { -- EW