searchidx: favor $sync->{ibx} (over $self->{ibx})

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

diff --git a/lib/PublicInbox/SearchIdx.pm b/lib/PublicInbox/SearchIdx.pm
index d3c904c761db3f3378cdb409095c824a9593d4bb..32fa16f5c227ff880f8d0008a973542231f30c20 100644 (file)
--- a/lib/PublicInbox/SearchIdx.pm
+++ b/lib/PublicInbox/SearchIdx.pm
@@ -22,7 +22,7 @@ use PublicInbox::OverIdx;
 use PublicInbox::Spawn qw(spawn nodatacow_dir);
 use PublicInbox::Git qw(git_unquote);
 use PublicInbox::MsgTime qw(msg_timestamp msg_datestamp);
-our @EXPORT_OK = qw(crlf_adjust log2stack is_ancestor check_size);
+our @EXPORT_OK = qw(crlf_adjust log2stack is_ancestor check_size prepare_stack);
 my $X = \%PublicInbox::Search::X;
 my ($DB_CREATE_OR_OPEN, $DB_OPEN);
 our $DB_NO_SYNC = 0;
@@ -137,7 +137,7 @@ sub idx_acquire {
                }
        }
        return unless defined $flag;
-       $flag |= $DB_NO_SYNC if $self->{ibx}->{-no_fsync};
+       $flag |= $DB_NO_SYNC if ($self->{ibx} // $self->{eidx})->{-no_fsync};
        my $xdb = eval { ($X->{WritableDatabase})->new($dir, $flag) };
        croak "Failed opening $dir: $@" if $@;
        $self->{xdb} = $xdb;
@@ -631,11 +631,16 @@ sub unindex_both { # git->cat_async callback
        unindex_eml($self, $oid, PublicInbox::Eml->new($bref));
 }
 
+sub with_umask {
+       my $self = shift;
+       ($self->{ibx} // $self->{eidx})->with_umask(@_);
+}
+
 # called by public-inbox-index
 sub index_sync {
        my ($self, $opt) = @_;
        delete $self->{lock_path} if $opt->{-skip_lock};
-       $self->{ibx}->with_umask(\&_index_sync, $self, $opt);
+       $self->with_umask(\&_index_sync, $self, $opt);
        if ($opt->{reindex}) {
                my %again = %$opt;
                delete @again{qw(rethread reindex)};
@@ -686,7 +691,7 @@ sub v1_checkpoint ($$;$) {
 
        $self->{oidx}->rethread_done($sync->{-opt}) if $newest; # all done
        commit_txn_lazy($self);
-       $self->{ibx}->git->cleanup;
+       $sync->{ibx}->git->cleanup;
        my $nr = ${$sync->{nr}};
        idx_release($self, $nr);
        # let another process do some work...
@@ -702,7 +707,7 @@ sub v1_checkpoint ($$;$) {
 # only for v1
 sub process_stack {
        my ($self, $sync, $stk) = @_;
-       my $git = $self->{ibx}->git;
+       my $git = $sync->{ibx}->git;
        my $max = $self->{batch_bytes};
        my $nr = 0;
        $sync->{nr} = \$nr;
@@ -736,11 +741,11 @@ sub process_stack {
        v1_checkpoint($self, $sync, $stk);
 }
 
-sub log2stack ($$$$) {
-       my ($sync, $git, $range, $ibx) = @_;
+sub log2stack ($$$) {
+       my ($sync, $git, $range) = @_;
        my $D = $sync->{D}; # OID_BIN => NR (if reindexing, undef otherwise)
        my ($add, $del);
-       if ($ibx->version == 1) {
+       if ($sync->{ibx}->version == 1) {
                my $path = $hex.'{2}/'.$hex.'{38}';
                $add = qr!\A:000000 100644 \S+ ($OID) A\t$path$!;
                $del = qr!\A:100644 000000 ($OID) \S+ D\t$path$!;
@@ -796,7 +801,7 @@ sub prepare_stack ($$) {
                return PublicInbox::IdxStack->new->read_prepare if $?;
        }
        $sync->{D} = $sync->{reindex} ? {} : undef; # OID_BIN => NR
-       log2stack($sync, $git, $range, $sync->{ibx});
+       log2stack($sync, $git, $range);
 }
 
 # --is-ancestor requires git 1.8.0+
@@ -893,7 +898,7 @@ sub _begin_txn {
 
 sub begin_txn_lazy {
        my ($self) = @_;
-       $self->{ibx}->with_umask(\&_begin_txn, $self) if !$self->{txn};
+       $self->with_umask(\&_begin_txn, $self) if !$self->{txn};
 }
 
 # store 'indexlevel=medium' in v2 shard=0 and v1 (only one shard)
@@ -931,7 +936,7 @@ sub _commit_txn {
 sub commit_txn_lazy {
        my ($self) = @_;
        delete($self->{txn}) and
-               $self->{ibx}->with_umask(\&_commit_txn, $self);
+               $self->with_umask(\&_commit_txn, $self);
 }
 
 sub worker_done {
@@ -945,6 +950,7 @@ sub worker_done {
 sub eidx_shard_new {
        my ($class, $eidx, $shard) = @_;
        my $self = bless {
+               eidx => $eidx,
                xpfx => $eidx->{xpfx},
                indexlevel => $eidx->{indexlevel},
                -skip_docdata => 1,