lei: move external vivification to xsearch

[public-inbox.git] / lib / PublicInbox / LeiQuery.pm

diff --git a/lib/PublicInbox/LeiQuery.pm b/lib/PublicInbox/LeiQuery.pm
index 941bc2997737a294f88a52d8a3942fdc9bb1da51..eebf217bb316df88093c4628d189145f2d4b7e5d 100644 (file)
--- a/lib/PublicInbox/LeiQuery.pm
+++ b/lib/PublicInbox/LeiQuery.pm
@@ -7,19 +7,6 @@ use strict;
 use v5.10.1;
 use PublicInbox::DS qw(dwaitpid);
 
-sub _vivify_external { # _externals_each callback
-       my ($src, $dir) = @_;
-       if (-f "$dir/ei.lock") {
-               require PublicInbox::ExtSearch;
-               push @$src, PublicInbox::ExtSearch->new($dir);
-       } elsif (-f "$dir/inbox.lock" || -d "$dir/public-inbox") { # v2, v1
-               require PublicInbox::Inbox;
-               push @$src, bless { inboxdir => $dir }, 'PublicInbox::Inbox';
-       } else {
-               warn "W: ignoring $dir, unable to determine type\n";
-       }
-}
-
 # the main "lei q SEARCH_TERMS" method
 sub lei_q {
        my ($self, @argv) = @_;
@@ -27,29 +14,30 @@ sub lei_q {
        require PublicInbox::LeiOverview;
        PublicInbox::Config->json; # preload before forking
        my $opt = $self->{opt};
-       my @srcs; # any number of LeiXSearch || LeiSearch || Inbox
+       my $lxs = $self->{lxs} = PublicInbox::LeiXSearch->new;
+       # any number of LeiXSearch || LeiSearch || Inbox
        if ($opt->{'local'} //= 1) { # --local is enabled by default
                my $sto = $self->_lei_store(1);
-               push @srcs, $sto->search;
+               $lxs->prepare_external($sto->search);
        }
-       my $lxs = PublicInbox::LeiXSearch->new;
 
        # --external is enabled by default, but allow --no-external
-       if ($opt->{external} // 1) {
-               $self->_externals_each(\&_vivify_external, \@srcs);
+       if ($opt->{external} //= 1) {
+               my $cb = $lxs->can('prepare_external');
+               $self->_externals_each($cb, $lxs);
        }
-       my $j = $opt->{jobs} // (scalar(@srcs) > 3 ? 3 : scalar(@srcs));
-       $j = 1 if !$opt->{thread};
-       $self->atfork_prepare_wq($lxs);
-       $lxs->wq_workers_start('lei_xsearch', $j, $self->oldset);
-       $self->{lxs} = $lxs;
-
+       my $xj = $opt->{thread} ? $lxs->locals : ($lxs->remotes + 1);
        my $ovv = PublicInbox::LeiOverview->new($self) or return;
+       $self->atfork_prepare_wq($lxs);
+       $lxs->wq_workers_start('lei_xsearch', $xj, $self->oldset);
+       delete $lxs->{-ipc_atfork_child_close};
        if (my $l2m = $self->{l2m}) {
-               $j = 4 if $j <= 4; # TODO configurable
+               my $mj = 4; # TODO: configurable
                $self->atfork_prepare_wq($l2m);
-               $l2m->wq_workers_start('lei2mail', $j, $self->oldset);
+               $l2m->wq_workers_start('lei2mail', $mj, $self->oldset);
+               delete $l2m->{-ipc_atfork_child_close};
        }
+
        # no forking workers after this
 
        my %mset_opt = map { $_ => $opt->{$_} } qw(thread limit offset);
@@ -75,7 +63,7 @@ sub lei_q {
        $mset_opt{relevance} //= -2 if $opt->{thread};
        $self->{mset_opt} = \%mset_opt;
        $ovv->ovv_begin($self);
-       $lxs->do_query($self, \@srcs);
+       $lxs->do_query($self);
 }
 
 1;