my ($self) = @_; # $_[1] = $rbuf
if (defined($_[1])) {
$_[1] eq '' and return eval {
- my $lse = delete $self->{lse};
- $lse->query_approxidate($lse->git,
+ $self->{lse}->query_approxidate($self->{lse}->git,
$self->{mset_opt}->{qstr});
_start_query($self);
};
}
}
-# the main "lei q SEARCH_TERMS" method
-sub lei_q {
- my ($self, @argv) = @_;
+sub lxs_prepare {
+ my ($self) = @_;
require PublicInbox::LeiXSearch;
- require PublicInbox::LeiOverview;
- require PublicInbox::V2Writable;
- PublicInbox::Config->json; # preload before forking
- my $opt = $self->{opt};
# prepare any number of LeiXSearch || LeiSearch || Inbox || URL
my $lxs = $self->{lxs} = PublicInbox::LeiXSearch->new;
+ my $opt = $self->{opt};
my @only = @{$opt->{only} // []};
# --local is enabled by default unless --only is used
# 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);
- }
+ my $sto = $self->_lei_store(1); # FIXME: should not create
+ $self->{lse} = $sto->search;
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);
+ $lxs->prepare_external($self->{lse});
}
if (@only) {
for my $loc (@only) {
}
}
}
- unless ($lxs->locals || $lxs->remotes) {
- return $self->fail('no local or remote inboxes to search');
- }
+ ($lxs->locals || $lxs->remotes) ? ($self->{lxs} = $lxs) :
+ $self->fail('no local or remote inboxes to search');
+}
+
+# the main "lei q SEARCH_TERMS" method
+sub lei_q {
+ my ($self, @argv) = @_;
+ require PublicInbox::LeiOverview;
+ require PublicInbox::V2Writable;
+ PublicInbox::Config->json; # preload before forking
+ PublicInbox::LeiOverview->new($self) or return;
+ my $lxs = lxs_prepare($self) or return;
$self->ale->refresh_externals($lxs);
+ my $opt = $self->{opt};
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");
if (defined($mj) && $mj !~ /\A[1-9][0-9]*\z/) {
return $self->fail("`$mj' writer jobs must be >= 1");
}
- PublicInbox::LeiOverview->new($self) or return;
+ if ($self->{l2m} && ($opt->{'import-remote'} //= 1) |
+ # we use \1 (a ref) to distinguish between
+ # user-supplied and default value
+ (($opt->{'import-before'} //= \1) ? 1 : 0)) {
+ $self->_lei_store(1)->write_prepare($self);
+ }
$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;
die "unrecognized --sort=$sort\n";
}
}
- # descending docid order
- $mset_opt{relevance} //= -2 if $opt->{threads};
+ # descending docid order is cheapest, MUA controls sorting order
+ $mset_opt{relevance} //= -2 if $self->{l2m} || $opt->{threads};
$self->{mset_opt} = \%mset_opt;
if ($opt->{stdin}) {
no query allowed on command-line with --stdin
require PublicInbox::InputPipe;
- $self->{lse} = $lse; # for query_approxidate
PublicInbox::InputPipe::consume($self->{0}, \&qstr_add, $self);
return;
}
- $mset_opt{qstr} = $lse->query_argv_to_string($lse->git, \@argv);
+ $mset_opt{qstr} =
+ $self->{lse}->query_argv_to_string($self->{lse}->git, \@argv);
_start_query($self);
}