[PATCH] search: avoid repeated mbox results from search

[PATCH] search: avoid repeated mbox results from search

[Eric Wong]

Previous search queries already set sort order on the Enquire
object, altering the ordering of results and was causing
messages to be redundantly downloaded via POST /$INBOX/?q=$QUERY&x=m

So stop caching the Search::Xapian::Enquire object since it
wasn't providing any measurable performance improvement.
---
 lib/PublicInbox/Search.pm | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/lib/PublicInbox/Search.pm b/lib/PublicInbox/Search.pm
index 5aabda0..69eca9f 100644
--- a/lib/PublicInbox/Search.pm
+++ b/lib/PublicInbox/Search.pm
@@ -219,14 +219,13 @@ sub _do_enquire {
 
 sub _enquire_once {
 	my ($self, $query, $opts) = @_;
-	my $enquire = enquire($self);
+	my $enquire = Search::Xapian::Enquire->new($self->{xdb});
 	$enquire->set_query($query);
 	$opts ||= {};
         my $desc = !$opts->{asc};
 	if (($opts->{mset} || 0) == 2) {
 		$enquire->set_docid_order(Search::Xapian::ENQ_ASCENDING());
 		$enquire->set_weighting_scheme(Search::Xapian::BoolWeight->new);
-		delete $self->{enquire};
 	} elsif ($opts->{relevance}) {
 		$enquire->set_sort_by_relevance_then_value(TS, $desc);
 	} else {
@@ -334,11 +333,6 @@ sub subject_normalized {
 	$subj;
 }
 
-sub enquire {
-	my ($self) = @_;
-	$self->{enquire} ||= Search::Xapian::Enquire->new($self->{xdb});
-}
-
 sub help {
 	my ($self) = @_;
 	$self->qp; # parse altids
-- 
EW