From f3482d4a19a8de47199fa18beb258deb699bf703 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Sun, 17 May 2020 00:08:54 +0000 Subject: [PATCH] index: v2: parallelize if --reindex or --jobs is specified `--reindex' involves chomping down lots of mail, so it benefits from parallelization just like the initial indexing. It's also a bit surprising to specify `--jobs/-j' without parallel processes, so ensure we turn on parallelization there, too. We can simplify initialization here, as well, since neither `eval' nor `V2Writable->new' should be in this code. --- lib/PublicInbox/Admin.pm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/PublicInbox/Admin.pm b/lib/PublicInbox/Admin.pm index 2c8d191a..e42b01e0 100644 --- a/lib/PublicInbox/Admin.pm +++ b/lib/PublicInbox/Admin.pm @@ -191,9 +191,8 @@ sub index_inbox { if (ref($ibx) && $ibx->version == 2) { eval { require PublicInbox::V2Writable }; die "v2 requirements not met: $@\n" if $@; - my $v2w = $im // eval { $ibx->importer(0) } || eval { - PublicInbox::V2Writable->new($ibx, {nproc=>$jobs}); - }; + $ibx->{-creat_opt}->{nproc} = $jobs; + my $v2w = $im // $ibx->importer($opt->{reindex} // $jobs); if (defined $jobs) { if ($jobs == 0) { $v2w->{parallel} = 0; -- 2.44.0