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-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 C3C711F5AF for ; Tue, 30 Mar 2021 09:10:55 +0000 (UTC) From: Eric Wong To: meta@public-inbox.org Subject: [PATCH] lei q: avoid redundant default setting for sort with l2m Date: Tue, 30 Mar 2021 09:10:55 +0000 Message-Id: <20210330091055.15228-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: No point in munging user-supplied $lei->{opt} when %mset_opt exists. We'll be depending on docid being in descending order for saved search support. --- lib/PublicInbox/LeiOverview.pm | 2 -- lib/PublicInbox/LeiQuery.pm | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/PublicInbox/LeiOverview.pm b/lib/PublicInbox/LeiOverview.pm index 68f6c792..cdd9ee04 100644 --- a/lib/PublicInbox/LeiOverview.pm +++ b/lib/PublicInbox/LeiOverview.pm @@ -101,8 +101,6 @@ sub new { if ($json) { $lei->{dedupe} //= PublicInbox::LeiDedupe->new($lei); } else { - # default to the cheapest sort since MUA usually resorts - $opt->{'sort'} //= 'docid' if $devfd < 0; $lei->{l2m} = eval { PublicInbox::LeiToMail->new($lei) }; return $lei->fail($@) if $@; if ($opt->{mua} && $lei->{l2m}->lock_free) { diff --git a/lib/PublicInbox/LeiQuery.pm b/lib/PublicInbox/LeiQuery.pm index 5376c7f8..3a437bf0 100644 --- a/lib/PublicInbox/LeiQuery.pm +++ b/lib/PublicInbox/LeiQuery.pm @@ -128,8 +128,8 @@ sub lei_q { die "unrecognized --sort=$sort\n"; } } - # descending docid order - $mset_opt{relevance} //= -2 if $opt->{threads}; + # descending docid order is cheapest, MUA controls sorting order + $mset_opt{relevance} //= -2 if $self->{l2m} || $opt->{threads}; $self->{mset_opt} = \%mset_opt; if ($opt->{stdin}) {