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 9D42C1F934 for ; Fri, 1 Jan 2021 05:47:50 +0000 (UTC) From: Eric Wong To: meta@public-inbox.org Subject: [PATCH 1/4] search: do not use $QP_FLAGS until Xapian is loaded Date: Thu, 31 Dec 2020 17:47:47 -1200 Message-Id: <20210101054750.6771-2-e@80x24.org> In-Reply-To: <20210101054750.6771-1-e@80x24.org> References: <20210101054750.6771-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: The default $QP_FLAGS won't be set until after Xapian is loaded, duh... This fixes t/imapd.t with TEST_RUN_MODE=0 --- lib/PublicInbox/Search.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/PublicInbox/Search.pm b/lib/PublicInbox/Search.pm index 547b6fbe..0bdf6fc6 100644 --- a/lib/PublicInbox/Search.pm +++ b/lib/PublicInbox/Search.pm @@ -196,6 +196,7 @@ sub xdb_shards_flat ($) { my $xpfx = $self->{xpfx}; my (@xdb, $slow_phrase); load_xapian(); + $self->{qp_flags} //= $QP_FLAGS; if ($xpfx =~ m/xapian${\SCHEMA_VERSION}\z/) { @xdb = ($X{Database}->new($xpfx)); $self->{qp_flags} |= FLAG_PHRASE() if !-f "$xpfx/iamchert"; @@ -232,7 +233,6 @@ sub mset_to_artnums { sub xdb ($) { my ($self) = @_; $self->{xdb} //= do { - $self->{qp_flags} //= $QP_FLAGS; my @xdb = $self->xdb_shards_flat or return; $self->{nshard} = scalar(@xdb); my $xdb = shift @xdb;