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 1a3e11932616466a760f258bfa55962cbb954746..eebf217bb316df88093c4628d189145f2d4b7e5d 100644 (file)
--- a/lib/PublicInbox/LeiQuery.pm
+++ b/lib/PublicInbox/LeiQuery.pm
@@ -7,50 +7,39 @@ 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) = @_;
-       my $sto = $self->_lei_store(1);
-       my $cfg = $self->_lei_cfg(1);
-       my $opt = $self->{opt};
-       require PublicInbox::LeiDedupe;
-       my $dd = PublicInbox::LeiDedupe->new($self);
-
-       # --local is enabled by default
-       # src: LeiXSearch || LeiSearch || Inbox
-       my @srcs;
        require PublicInbox::LeiXSearch;
        require PublicInbox::LeiOverview;
-       my $lxs = PublicInbox::LeiXSearch->new;
+       PublicInbox::Config->json; # preload before forking
+       my $opt = $self->{opt};
+       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);
+               $lxs->prepare_external($sto->search);
+       }
 
        # --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};
-       $j++ if $opt->{'local'}; # for sto->search below
+       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', $j, $self->oldset)
-               // $lxs->wq_workers($j);
+       $lxs->wq_workers_start('lei_xsearch', $xj, $self->oldset);
+       delete $lxs->{-ipc_atfork_child_close};
+       if (my $l2m = $self->{l2m}) {
+               my $mj = 4; # TODO: configurable
+               $self->atfork_prepare_wq($l2m);
+               $l2m->wq_workers_start('lei2mail', $mj, $self->oldset);
+               delete $l2m->{-ipc_atfork_child_close};
+       }
 
-       unshift(@srcs, $sto->search) if $opt->{'local'};
        # no forking workers after this
-       require PublicInbox::LeiOverview;
-       $self->{ovv} = PublicInbox::LeiOverview->new($self);
+
        my %mset_opt = map { $_ => $opt->{$_} } qw(thread limit offset);
        $mset_opt{asc} = $opt->{'reverse'} ? 1 : 0;
        $mset_opt{qstr} = join(' ', map {;
@@ -70,13 +59,11 @@ sub lei_q {
                        die "unrecognized --sort=$sort\n";
                }
        }
-       # $self->out($json->encode(\%mset_opt));
        # descending docid order
        $mset_opt{relevance} //= -2 if $opt->{thread};
-       # my $wcb = PublicInbox::LeiToMail->write_cb($out, $self);
        $self->{mset_opt} = \%mset_opt;
-       $self->{ovv}->ovv_begin($self);
-       $lxs->do_query($self, \@srcs);
+       $ovv->ovv_begin($self);
+       $lxs->do_query($self);
 }
 
 1;