From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-4.2 required=3.0 tests=ALL_TRUSTED,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF shortcircuit=no autolearn=ham autolearn_force=no version=3.4.6 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id 30F2B1F626 for ; Fri, 17 Feb 2023 10:36:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=80x24.org; s=selector1; t=1676630174; bh=HSRROhsiJBzVbG2dEIzELsgGQjRFjeR/SSX2Tn9VzAA=; h=From:To:Subject:Date:From; b=e73rL6+jwoDd6ds2rrF0A3c85jAsim464Bsluvo4vaICh6E8wozXDLj2irNpCu5ye tChiRO8W9n94ynsxWVP3XFJXXKgJdhQDDBEe1nlEt4ulEuFsfIlQrko4Nk5rF923K1 IRv8vn6I0zhk9zsuZ647CEf7H5URD8uOG9bRcOKE= From: Eric Wong To: meta@public-inbox.org Subject: [PATCH] search: move query transform + enquire setup out of retry loop Date: Fri, 17 Feb 2023 10:36:14 +0000 Message-Id: <20230217103614.3183911-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: The Xapian query transformation and Enquire object setup aren't subject to MVCC and retries, so move it outside the retry loop to save some cycles in case we need to retry on a busy DB. --- lib/PublicInbox/Search.pm | 80 +++++++++++++++++++-------------------- 1 file changed, 38 insertions(+), 42 deletions(-) diff --git a/lib/PublicInbox/Search.pm b/lib/PublicInbox/Search.pm index 273cc57c..7f470f29 100644 --- a/lib/PublicInbox/Search.pm +++ b/lib/PublicInbox/Search.pm @@ -390,11 +390,43 @@ sub query_approxidate { # read-only sub mset { - my ($self, $query_string, $opts) = @_; - $opts ||= {}; + my ($self, $query_string, $opt) = @_; + $opt ||= {}; my $qp = $self->{qp} //= $self->qparse_new; my $query = $qp->parse_query($query_string, $self->{qp_flags}); - _do_enquire($self, $query, $opts); + if (defined(my $eidx_key = $opt->{eidx_key})) { + $query = $X{Query}->new(OP_FILTER(), $query, 'O'.$eidx_key); + } + if (defined(my $uid_range = $opt->{uid_range})) { + my $range = $X{Query}->new(OP_VALUE_RANGE(), UID, + sortable_serialise($uid_range->[0]), + sortable_serialise($uid_range->[1])); + $query = $X{Query}->new(OP_FILTER(), $query, $range); + } + my $xdb = xdb($self); + my $enq = $X{Enquire}->new($xdb); + $enq->set_query($query); + $opt ||= {}; + my $rel = $opt->{relevance} // 0; + if ($rel == -2) { # ORDER BY docid/UID (highest first) + $enq->set_weighting_scheme($X{BoolWeight}->new); + $enq->set_docid_order($ENQ_DESCENDING); + } elsif ($rel == -1) { # ORDER BY docid/UID (lowest first) + $enq->set_weighting_scheme($X{BoolWeight}->new); + $enq->set_docid_order($ENQ_ASCENDING); + } elsif ($rel == 0) { + $enq->set_sort_by_value_then_relevance(TS, !$opt->{asc}); + } else { # rel > 0 + $enq->set_sort_by_relevance_then_value(TS, !$opt->{asc}); + } + + # `lei q -t / --threads' or JMAP collapseThreads; but don't collapse + # on `-tt' ({threads} > 1) which sets the Flagged|Important keyword + if (($opt->{threads} // 0) == 1 && has_threadid($self)) { + $enq->set_collapse_key(THREADID); + } + retry_reopen($self, \&enquire_once, $enq, + $opt->{offset} || 0, $opt->{limit} || 50); } sub retry_reopen { @@ -421,51 +453,15 @@ sub retry_reopen { Carp::croak("Too many Xapian database modifications in progress\n"); } -sub _do_enquire { - my ($self, $query, $opts) = @_; - retry_reopen($self, \&_enquire_once, $query, $opts); -} - # returns true if all docs have the THREADID value sub has_threadid ($) { my ($self) = @_; (xdb($self)->get_metadata('has_threadid') // '') eq '1'; } -sub _enquire_once { # retry_reopen callback - my ($self, $query, $opts) = @_; - my $xdb = xdb($self); - if (defined(my $eidx_key = $opts->{eidx_key})) { - $query = $X{Query}->new(OP_FILTER(), $query, 'O'.$eidx_key); - } - if (defined(my $uid_range = $opts->{uid_range})) { - my $range = $X{Query}->new(OP_VALUE_RANGE(), UID, - sortable_serialise($uid_range->[0]), - sortable_serialise($uid_range->[1])); - $query = $X{Query}->new(OP_FILTER(), $query, $range); - } - my $enquire = $X{Enquire}->new($xdb); - $enquire->set_query($query); - $opts ||= {}; - my $rel = $opts->{relevance} // 0; - if ($rel == -2) { # ORDER BY docid/UID (highest first) - $enquire->set_weighting_scheme($X{BoolWeight}->new); - $enquire->set_docid_order($ENQ_DESCENDING); - } elsif ($rel == -1) { # ORDER BY docid/UID (lowest first) - $enquire->set_weighting_scheme($X{BoolWeight}->new); - $enquire->set_docid_order($ENQ_ASCENDING); - } elsif ($rel == 0) { - $enquire->set_sort_by_value_then_relevance(TS, !$opts->{asc}); - } else { # rel > 0 - $enquire->set_sort_by_relevance_then_value(TS, !$opts->{asc}); - } - - # `lei q -t / --threads' or JMAP collapseThreads; but don't collapse - # on `-tt' ({threads} > 1) which sets the Flagged|Important keyword - if (($opts->{threads} // 0) == 1 && has_threadid($self)) { - $enquire->set_collapse_key(THREADID); - } - $enquire->get_mset($opts->{offset} || 0, $opts->{limit} || 50); +sub enquire_once { # retry_reopen callback + my (undef, $enq, $offset, $limit) = @_; + $enq->get_mset($offset, $limit); } sub mset_to_smsg {