lei: All Local Externals: bare git dir for alternates

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

diff --git a/lib/PublicInbox/LeiQuery.pm b/lib/PublicInbox/LeiQuery.pm
index eaf91f2ec90b02647bc935788dd8aa6ff62a342c..007e35fc41cf061b4ce963afc0ba99e0fda37d94 100644 (file)
--- a/lib/PublicInbox/LeiQuery.pm
+++ b/lib/PublicInbox/LeiQuery.pm
@@ -5,6 +5,7 @@
 package PublicInbox::LeiQuery;
 use strict;
 use v5.10.1;
+use POSIX ();
 
 sub prep_ext { # externals_each callback
        my ($lxs, $exclude, $loc) = @_;
@@ -13,14 +14,11 @@ sub prep_ext { # externals_each callback
 
 sub _start_query {
        my ($self) = @_;
-       if (my $nwr = $self->{nwr}) {
+       if ($self->{net}) {
                require PublicInbox::LeiAuth;
-               my $auth = $self->{auth} = PublicInbox::LeiAuth->new($nwr);
-               my $lxs = $self->{lxs};
-               $auth->auth_start($self, $lxs->can('do_query'), $lxs, $self);
-       } else {
-               $self->{lxs}->do_query($self);
+               $self->{auth} = PublicInbox::LeiAuth->new
        }
+       $self->{lxs}->do_query($self);
 }
 
 sub qstr_add { # PublicInbox::InputPipe::consume callback for --stdin
@@ -53,8 +51,16 @@ sub lei_q {
        # we'll allow "--only $LOCATION --local"
        my $sto = $self->_lei_store(1);
        my $lse = $sto->search;
+       if (($opt->{'import-remote'} //= 1) |
+                       (($opt->{'import-before'} //= \1) ? 1 : 0)) {
+               $sto->write_prepare($self);
+       }
        if ($opt->{'local'} //= scalar(@only) ? 0 : 1) {
                $lxs->prepare_external($lse);
+       } else {
+               my $tmp = PublicInbox::LeiXSearch->new;
+               $tmp->prepare_external($lse);
+               $self->ale->refresh_externals($tmp);
        }
        if (@only) {
                for my $loc (@only) {
@@ -62,9 +68,12 @@ sub lei_q {
                        $lxs->prepare_external($_) for @loc;
                }
        } else {
+               my (@ilocals, @iremotes);
                for my $loc (@{$opt->{include} // []}) {
                        my @loc = $self->get_externals($loc) or return;
                        $lxs->prepare_external($_) for @loc;
+                       @ilocals = @{$lxs->{locals} // []};
+                       @iremotes = @{$lxs->{remotes} // []};
                }
                # --external is enabled by default, but allow --no-external
                if ($opt->{external} //= 1) {
@@ -76,28 +85,32 @@ sub lei_q {
                        my $ne = $self->externals_each(\&prep_ext, $lxs, \%x);
                        $opt->{remote} //= !($lxs->locals - $opt->{'local'});
                        if ($opt->{'local'}) {
-                               delete($lxs->{remotes}) if !$opt->{remote};
+                               $lxs->{remotes} = \@iremotes if !$opt->{remote};
                        } else {
-                               delete($lxs->{locals});
+                               $lxs->{locals} = \@ilocals;
                        }
                }
        }
        unless ($lxs->locals || $lxs->remotes) {
                return $self->fail('no local or remote inboxes to search');
        }
+       $self->ale->refresh_externals($lxs);
        my ($xj, $mj) = split(/,/, $opt->{jobs} // '');
        if (defined($xj) && $xj ne '' && $xj !~ /\A[1-9][0-9]*\z/) {
                return $self->fail("`$xj' search jobs must be >= 1");
        }
        $xj ||= $lxs->concurrency($opt); # allow: "--jobs ,$WRITER_ONLY"
-       my $nproc = $lxs->detect_nproc; # don't memoize, schedtool(1) exists
+       my $nproc = $lxs->detect_nproc // 1; # don't memoize, schedtool(1) exists
        $xj = $nproc if $xj > $nproc;
-       $lxs->{jobs} = $xj;
+       $lxs->{-wq_nr_workers} = $xj;
        if (defined($mj) && $mj !~ /\A[1-9][0-9]*\z/) {
                return $self->fail("`$mj' writer jobs must be >= 1");
        }
-       $self->{l2m}->{jobs} = ($mj // $nproc) if $self->{l2m};
        PublicInbox::LeiOverview->new($self) or return;
+       $self->{l2m} and $self->{l2m}->{-wq_nr_workers} = $mj // do {
+               $mj = POSIX::lround($nproc * 3 / 4); # keep some CPU for git
+               $mj <= 0 ? 1 : $mj;
+       };
 
        my %mset_opt = map { $_ => $opt->{$_} } qw(threads limit offset);
        $mset_opt{asc} = $opt->{'reverse'} ? 1 : 0;