over: rename ->connect method to ->dbh

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

diff --git a/lib/PublicInbox/Xapcmd.pm b/lib/PublicInbox/Xapcmd.pm
index 348621cef0bfd724eb9366d69e9ffd05294def30..6a74daf92b5be1e4345ce473f28a66b3db5e7f1b 100644 (file)
--- a/lib/PublicInbox/Xapcmd.pm
+++ b/lib/PublicInbox/Xapcmd.pm
@@ -9,7 +9,7 @@ use PublicInbox::SearchIdx;
 use File::Temp 0.19 (); # ->newdir
 use File::Path qw(remove_tree);
 use File::Basename qw(dirname);
-use POSIX ();
+use POSIX qw(WNOHANG);
 
 # support testing with dev versions of Xapian which installs
 # commands with a version number suffix (e.g. "xapian-compact-1.5")
@@ -19,7 +19,6 @@ our @COMPACT_OPT = qw(jobs|j=i quiet|q blocksize|b=s no-full|n fuller|F);
 sub commit_changes ($$$$) {
        my ($ibx, $im, $tmp, $opt) = @_;
        my $reshard = $opt->{reshard};
-       my $reindex = $opt->{reindex};
 
        $SIG{INT} or die 'BUG: $SIG{INT} not handled';
        my @old_shard;
@@ -38,7 +37,7 @@ sub commit_changes ($$$$) {
                        defined $new or die "BUG: $over exists when culling v2";
                        $over = PublicInbox::Over->new($over);
                        my $tmp_over = "$new/over.sqlite3";
-                       $over->connect->sqlite_backup_to_file($tmp_over);
+                       $over->dbh->sqlite_backup_to_file($tmp_over);
                        $over = undef;
                        $over_chg = 1;
                }
@@ -82,7 +81,8 @@ sub commit_changes ($$$$) {
                                $im->{shards} = $n;
                        }
                }
-
+               my $env = $opt->{-idx_env};
+               local %ENV = (%ENV, %$env) if $env;
                PublicInbox::Admin::index_inbox($ibx, $im, $opt);
        }
 }
@@ -101,17 +101,17 @@ sub runnable_or_die ($) {
 }
 
 sub prepare_reindex ($$$) {
-       my ($ibx, $im, $reindex) = @_;
+       my ($ibx, $im, $opt) = @_;
        if ($ibx->version == 1) {
                my $dir = $ibx->search->xdir(1);
                my $xdb = $PublicInbox::Search::X{Database}->new($dir);
                if (my $lc = $xdb->get_metadata('last_commit')) {
-                       $reindex->{from} = $lc;
+                       $opt->{reindex}->{from} = $lc;
                }
        } else { # v2
                my $max;
                $im->git_dir_latest(\$max) or return;
-               my $from = $reindex->{from};
+               my $from = $opt->{reindex}->{from};
                my $mm = $ibx->mm;
                my $v = PublicInbox::Search::SCHEMA_VERSION();
                foreach my $i (0..$max) {
@@ -151,14 +151,17 @@ sub process_queue {
                        $pids{cb_spawn($cb, $args, $opt)} = $args;
                }
 
+               my $flags = 0;
                while (scalar keys %pids) {
-                       my $pid = waitpid(-1, 0);
+                       my $pid = waitpid(-1, $flags) or last;
+                       last if $pid < 0;
                        my $args = delete $pids{$pid};
                        if ($args) {
                                die join(' ', @$args)." failed: $?\n" if $?;
                        } else {
                                warn "unknown PID($pid) reaped: $?\n";
                        }
+                       $flags = WNOHANG if scalar(@$queue);
                }
        }
 }
@@ -234,14 +237,14 @@ sub prepare_run {
 sub check_compact () { runnable_or_die($XAPIAN_COMPACT) }
 
 sub _run {
-       my ($ibx, $cb, $opt, $reindex) = @_;
+       my ($ibx, $cb, $opt) = @_;
        my $im = $ibx->importer(0);
        $im->lock_acquire;
        my ($tmp, $queue) = prepare_run($ibx, $opt);
 
        # fine-grained locking if we prepare for reindex
        if (!$opt->{-coarse_lock}) {
-               prepare_reindex($ibx, $im, $reindex);
+               prepare_reindex($ibx, $im, $opt);
                $im->lock_release;
        }
 
@@ -253,24 +256,23 @@ sub _run {
 
 sub run {
        my ($ibx, $task, $opt) = @_; # task = 'cpdb' or 'compact'
-       my $cb = \&${\"PublicInbox::Xapcmd::$task"};
+       my $cb = \&$task;
        PublicInbox::Admin::progress_prepare($opt ||= {});
        defined(my $dir = $ibx->{inboxdir}) or die "no inboxdir defined\n";
        -d $dir or die "inboxdir=$dir does not exist\n";
        check_compact() if $opt->{compact} && $ibx->search;
-       my $reindex; # v1:{ from => $x40 }, v2:{ from => [ $x40, $x40, .. ] } }
 
        if (!$opt->{-coarse_lock}) {
-               $reindex = $opt->{reindex} = { # per-epoch ranges for v2
-                       from => $ibx->version == 1 ? '' : [],
-               };
+               # per-epoch ranges for v2
+               # v1:{ from => $OID }, v2:{ from => [ $OID, $OID, $OID ] } }
+               $opt->{reindex} = { from => $ibx->version == 1 ? '' : [] };
                PublicInbox::SearchIdx::load_xapian_writable();
        }
 
        local %SIG = %SIG;
        setup_signals();
        $ibx->umask_prepare;
-       $ibx->with_umask(\&_run, $ibx, $cb, $opt, $reindex);
+       $ibx->with_umask(\&_run, $ibx, $cb, $opt);
 }
 
 sub cpdb_retryable ($$) {