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 EB6DE1FA17 for ; Fri, 1 Jan 2021 05:47:50 +0000 (UTC) From: Eric Wong To: meta@public-inbox.org Subject: [PATCH 4/4] treewide: reduce load_xapian* callsites Date: Thu, 31 Dec 2020 17:47:50 -1200 Message-Id: <20210101054750.6771-5-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: Hopefully this will make it easier to spot dependency bugs in the future. --- lib/PublicInbox/LEI.pm | 1 - lib/PublicInbox/LeiStore.pm | 5 +---- t/indexlevels-mirror.t | 4 +--- t/replace.t | 3 +-- 4 files changed, 3 insertions(+), 10 deletions(-) diff --git a/lib/PublicInbox/LEI.pm b/lib/PublicInbox/LEI.pm index 320a2bfc..2bc4a916 100644 --- a/lib/PublicInbox/LEI.pm +++ b/lib/PublicInbox/LEI.pm @@ -453,7 +453,6 @@ sub _lei_store ($;$) { my $cfg = _lei_cfg($self, $creat); $cfg->{-lei_store} //= do { require PublicInbox::LeiStore; - PublicInbox::SearchIdx::load_xapian_writable(); my $dir = $cfg->{'leistore.dir'}; $dir //= _store_path($self->{env}) if $creat; return unless $dir; diff --git a/lib/PublicInbox/LeiStore.pm b/lib/PublicInbox/LeiStore.pm index a23efed5..07a3198a 100644 --- a/lib/PublicInbox/LeiStore.pm +++ b/lib/PublicInbox/LeiStore.pm @@ -24,10 +24,7 @@ sub new { my (undef, $dir, $opt) = @_; my $eidx = PublicInbox::ExtSearchIdx->new($dir, $opt); my $self = bless { priv_eidx => $eidx }, __PACKAGE__; - if ($opt->{creat}) { - PublicInbox::SearchIdx::load_xapian_writable(); - eidx_init($self); - } + eidx_init($self) if $opt->{creat}; $self; } diff --git a/t/indexlevels-mirror.t b/t/indexlevels-mirror.t index a2afbd74..53826aef 100644 --- a/t/indexlevels-mirror.t +++ b/t/indexlevels-mirror.t @@ -172,9 +172,7 @@ my $import_index_incremental = sub { $import_index_incremental->($PI_TEST_VERSION, 'basic', $mime); SKIP: { - require PublicInbox::Search; - PublicInbox::Search::load_xapian() or - skip('Xapian perl binding missing', 2); + require_mods(qw(Search::Xapian), 2); foreach my $l (qw(medium full)) { $import_index_incremental->($PI_TEST_VERSION, $l, $mime); } diff --git a/t/replace.t b/t/replace.t index 7135c863..51bdb964 100644 --- a/t/replace.t +++ b/t/replace.t @@ -186,8 +186,7 @@ test_replace(2, 'basic', $opt = { %$opt, post => \&pad_msgs }); test_replace(2, 'basic', $opt = { %$opt, rotate_bytes => 1 }); SKIP: { - require PublicInbox::Search; - PublicInbox::Search::load_xapian() or skip 'Search::Xapian missing', 8; + require_mods(qw(Search::Xapian), 8); for my $l (qw(medium)) { test_replace(2, $l, {}); $opt = { pre => \&pad_msgs };