From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) 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.2 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id 65BD31F453 for ; Sun, 20 Jan 2019 12:37:50 +0000 (UTC) From: Eric Wong To: meta@public-inbox.org Subject: [PATCH] extmsg: don't bother partial matching with <16 chars Date: Sun, 20 Jan 2019 12:37:50 +0000 Message-Id: <20190120123750.15448-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: It's not worth it, and attempts to wildcard off single-character Message-IDs(*) causes Xapian to error out in unpredictable ways: something terrible happened at /usr/lib/x86_64-linux-gnu/perl5/5.24/Search/Xapian/Enquire.pm line 54. ...propagated at lib/PublicInbox/Search.pm line 209. So don't bother. (*) because people blindly hit 'y' or 'n' when git-send-email prompted them for In-Reply-To. --- lib/PublicInbox/ExtMsg.pm | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/lib/PublicInbox/ExtMsg.pm b/lib/PublicInbox/ExtMsg.pm index 51e7799..14d49cc 100644 --- a/lib/PublicInbox/ExtMsg.pm +++ b/lib/PublicInbox/ExtMsg.pm @@ -11,6 +11,7 @@ package PublicInbox::ExtMsg; use PublicInbox::Hval; use PublicInbox::MID qw/mid2path/; use PublicInbox::WwwStream; +our $MIN_PARTIAL_LEN = 16; # TODO: user-configurable our @EXT_URL = ( @@ -30,6 +31,7 @@ package PublicInbox::ExtMsg; sub search_partial ($$) { my ($srch, $mid) = @_; + return if length($mid) < $MIN_PARTIAL_LEN; my $opt = { limit => PARTIAL_MAX, mset => 2 }; my @try = ("m:$mid*"); my $chop = $mid; @@ -58,12 +60,12 @@ ($$) } foreach my $m (@try) { - my $mset = eval { $srch->query($m, $opt) }; - if (ref($@) eq 'Search::Xapian::QueryParserError') { - # If Xapian can't handle the wildcard since it - # has too many results. - next; - } + # If Xapian can't handle the wildcard since it + # has too many results. $@ can be + # 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; @@ -112,7 +114,7 @@ sub ext_msg { } # can't find a partial match in current inbox, try the others: - if (!$n_partial && length($mid) >= 16) { + if (!$n_partial && length($mid) >= $MIN_PARTIAL_LEN) { foreach my $ibx (@ibx) { $srch = $ibx->search or next; $mids = search_partial($srch, $mid) or next; -- EW