index: --compact respects --jobs

And -compact supports --jobs=0 like -index to disable parallel
execution.  Running three xapian-compact processes in parallel
on a USB 2.0 HDD is pretty painful.

diff --git a/lib/PublicInbox/Xapcmd.pm b/lib/PublicInbox/Xapcmd.pm
index d6c069d75efe25535579fe46505cabee1b245290..3b7a581bd5c872463447c86dd81113ddd5f5db04 100644 (file)
--- a/lib/PublicInbox/Xapcmd.pm
+++ b/lib/PublicInbox/Xapcmd.pm
@@ -129,7 +129,7 @@ sub same_fs_or_die ($$) {
 
 sub process_queue {
        my ($queue, $cb, $opt) = @_;
-       my $max = $opt->{jobs} || scalar(@$queue);
+       my $max = $opt->{jobs} // scalar(@$queue);
        if ($max <= 1) {
                while (defined(my $args = shift @$queue)) {
                        $cb->($args, $opt);

diff --git a/script/public-inbox-index b/script/public-inbox-index
index d5c7cae2b9f53d0ca5c797bb60c5ec4cf7e2b282..5a0ceab7813e6f3d2abf7495216d505c348cd75d 100755 (executable)
--- a/script/public-inbox-index
+++ b/script/public-inbox-index
@@ -24,6 +24,9 @@ if ($opt->{compact}) {
        require PublicInbox::Xapcmd;
        PublicInbox::Xapcmd::check_compact();
        $compact_opt = { -coarse_lock => 1, compact => 1 };
+       if (defined(my $jobs = $opt->{jobs})) {
+               $compact_opt->{jobs} = $jobs;
+       }
 }
 
 my $cfg = PublicInbox::Config->new;