* [PATCH 0/4] lei blob (formerly known as "lei show")
@ 2021-03-27 11:45 7% Eric Wong
2021-03-27 11:45 6% ` [PATCH 3/4] lei_query: hoist out lxs_prepare Eric Wong
0 siblings, 1 reply; 2+ results
From: Eric Wong @ 2021-03-27 11:45 UTC (permalink / raw)
To: meta
It's still a "git show" with blob reconstruction (aka "solver")
I'm not sure if lei <add|ls|forget>-coderepo is necessary,
since this supports multiple --git-dir args (and uses
the current working directory).
Maybe submodule directories could be scanned...
Eric Wong (4):
lei_ale: do not create store unnecessarily
lei help: move "lei help" into LeiHelp.pm
lei_query: hoist out lxs_prepare
lei blob: aka "git-show-harder" for blobs
MANIFEST | 1 +
lib/PublicInbox/LEI.pm | 26 ++++----
lib/PublicInbox/LeiALE.pm | 3 +-
lib/PublicInbox/LeiBlob.pm | 119 ++++++++++++++++++++++++++++++++++++
lib/PublicInbox/LeiHelp.pm | 3 +
lib/PublicInbox/LeiQuery.pm | 38 +++++++-----
t/lei-import.t | 2 +
t/solver_git.t | 14 ++++-
8 files changed, 173 insertions(+), 33 deletions(-)
create mode 100644 lib/PublicInbox/LeiBlob.pm
^ permalink raw reply [relevance 7%]
* [PATCH 3/4] lei_query: hoist out lxs_prepare
2021-03-27 11:45 7% [PATCH 0/4] lei blob (formerly known as "lei show") Eric Wong
@ 2021-03-27 11:45 6% ` Eric Wong
0 siblings, 0 replies; 2+ results
From: Eric Wong @ 2021-03-27 11:45 UTC (permalink / raw)
To: meta
We'll be reusing it for "lei blob", as it makes sense
to keep handling of --only, --include, etc. switches
consistent.
---
lib/PublicInbox/LeiQuery.pm | 38 +++++++++++++++++++++----------------
1 file changed, 22 insertions(+), 16 deletions(-)
diff --git a/lib/PublicInbox/LeiQuery.pm b/lib/PublicInbox/LeiQuery.pm
index 65aa9e87..5376c7f8 100644
--- a/lib/PublicInbox/LeiQuery.pm
+++ b/lib/PublicInbox/LeiQuery.pm
@@ -35,23 +35,19 @@ sub qstr_add { # PublicInbox::InputPipe::consume callback for --stdin
}
}
-# 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 = $self->{lse} = $sto->search;
+ 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);
+ $lxs->prepare_external($self->{lse});
}
if (@only) {
for my $loc (@only) {
@@ -82,10 +78,20 @@ sub lei_q {
}
}
}
- 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");
@@ -97,12 +103,11 @@ sub lei_q {
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)) {
- $sto->write_prepare($self);
+ $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
@@ -135,7 +140,8 @@ no query allowed on command-line with --stdin
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);
}
^ permalink raw reply related [relevance 6%]
Results 1-2 of 2 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2021-03-27 11:45 7% [PATCH 0/4] lei blob (formerly known as "lei show") Eric Wong
2021-03-27 11:45 6% ` [PATCH 3/4] lei_query: hoist out lxs_prepare Eric Wong
Code repositories for project(s) associated with this public inbox
https://80x24.org/public-inbox.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).