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 8671D1F9E0 for ; Thu, 23 Apr 2020 01:54:52 +0000 (UTC) From: Eric Wong To: meta@public-inbox.org Subject: [PATCH] feed: drop needless version check Date: Thu, 23 Apr 2020 01:54:52 +0000 Message-Id: <20200423015452.22656-1-e@yhbt.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: We don't need to be checking inbox versions in parts of the WWW code. Checking the presence of $ibx->over is enough, everywhere. --- lib/PublicInbox/Feed.pm | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/lib/PublicInbox/Feed.pm b/lib/PublicInbox/Feed.pm index 07347c63..4cb295e6 100644 --- a/lib/PublicInbox/Feed.pm +++ b/lib/PublicInbox/Feed.pm @@ -84,15 +84,10 @@ sub recent_msgs { my ($ctx) = @_; my $ibx = $ctx->{-inbox}; my $max = $ibx->{feedmax}; - my $qp = $ctx->{qp}; - my $v = $ibx->version; - if ($v > 2) { - die "BUG: unsupported inbox version: $v\n"; - } - if ($ibx->over) { - return PublicInbox::View::paginate_recent($ctx, $max); - } + return PublicInbox::View::paginate_recent($ctx, $max) if $ibx->over; + # only for rare v1 inboxes which aren't indexed at all + my $qp = $ctx->{qp}; my $hex = '[a-f0-9]'; my $addmsg = qr!^:000000 100644 \S+ (\S+) A\t${hex}{2}/${hex}{38}$!; my $delmsg = qr!^:100644 000000 (\S+) \S+ D\t(${hex}{2}/${hex}{38})$!;