index: cleanup internal variables

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

diff --git a/lib/PublicInbox/V2Writable.pm b/lib/PublicInbox/V2Writable.pm
index 28d45d6ab8dbee7f5a6b010ef0b01560f11accaf..72198a2983282865fdcf94ed7c784be038bc94d6 100644 (file)
--- a/lib/PublicInbox/V2Writable.pm
+++ b/lib/PublicInbox/V2Writable.pm
@@ -151,12 +151,6 @@ sub add {
        $self->{ibx}->with_umask(\&_add, $self, $eml, $check_cb);
 }
 
-sub batch_bytes ($) {
-       my ($self) = @_;
-       ($self->{parallel} ? $self->{shards} : 1) *
-               $PublicInbox::SearchIdx::BATCH_BYTES;
-}
-
 # indexes a message, returns true if checkpointing is needed
 sub do_idx ($$$$) {
        my ($self, $msgref, $mime, $smsg) = @_;
@@ -165,7 +159,7 @@ sub do_idx ($$$$) {
        my $idx = idx_shard($self, $smsg->{num} % $self->{shards});
        $idx->index_raw($msgref, $mime, $smsg);
        my $n = $self->{transact_bytes} += $smsg->{raw_bytes};
-       $n >= batch_bytes($self);
+       $n >= $self->{batch_bytes};
 }
 
 sub _add {
@@ -286,6 +280,9 @@ sub _idx_init { # with_umask callback
        # xcpdb can change shard count while -watch is idle
        my $nshards = count_shards($self);
        $self->{shards} = $nshards if $nshards && $nshards != $self->{shards};
+       $self->{batch_bytes} = $opt->{batch_size} //
+                               $PublicInbox::SearchIdx::BATCH_BYTES;
+       $self->{batch_bytes} *= $self->{shards} if $self->{parallel};
 
        # need to create all shards before initializing msgmap FD
        # idx_shards must be visible to all forked processes
@@ -890,7 +887,7 @@ sub reindex_checkpoint ($$) {
        }
 
        # allow -watch or -mda to write...
-       $self->idx_init; # reacquire lock
+       $self->idx_init($sync->{-opt}); # reacquire lock
        $mm_tmp->atfork_parent if $mm_tmp;
 }
 
@@ -1207,12 +1204,11 @@ sub index_xap_step ($$$;$) {
                $pr->("Xapian indexlevel=$ibx->{indexlevel} ".
                        "$beg..$end (% $step)\n");
        }
-       my $batch_bytes = batch_bytes($self);
        for (my $num = $beg; $num <= $end; $num += $step) {
                my $smsg = $ibx->over->get_art($num) or next;
                $smsg->{v2w} = $self;
                $ibx->git->cat_async($smsg->{blob}, \&index_xap_only, $smsg);
-               if ($self->{transact_bytes} >= $batch_bytes) {
+               if ($self->{transact_bytes} >= $self->{batch_bytes}) {
                        ${$sync->{nr}} = $num;
                        reindex_checkpoint($self, $sync);
                }
@@ -1235,7 +1231,7 @@ sub index_epoch ($$$) {
                $self->{current_info} = "$i.git $oid";
                if ($f eq 'm') {
                        my $arg = { %$sync, autime => $at, cotime => $ct };
-                       if ($sync->{index_max_size}) {
+                       if ($sync->{max_size}) {
                                $all->check_async($oid, \&check_size, $arg);
                        } else {
                                $all->cat_async($oid, \&index_oid, $arg);
@@ -1254,7 +1250,7 @@ sub index_epoch ($$$) {
 
 sub xapian_only {
        my ($self, $opt, $sync, $art_beg) = @_;
-       my $seq = $opt->{sequentialshard};
+       my $seq = $opt->{sequential_shard};
        $art_beg //= 0;
        local $self->{parallel} = 0 if $seq;
        $self->idx_init($opt); # acquire lock
@@ -1284,14 +1280,14 @@ sub xapian_only {
 sub index_sync {
        my ($self, $opt) = @_;
        $opt //= $_[1] //= {};
-       goto \&xapian_only if $opt->{xapianonly};
+       goto \&xapian_only if $opt->{xapian_only};
 
        my $pr = $opt->{-progress};
        my $epoch_max;
        my $latest = git_dir_latest($self, \$epoch_max);
        return unless defined $latest;
 
-       my $seq = $opt->{sequentialshard};
+       my $seq = $opt->{sequential_shard};
        my $art_beg; # the NNTP article number we start xapian_only at
        my $idxlevel = $self->{ibx}->{indexlevel};
        local $self->{ibx}->{indexlevel} = 'basic' if $seq;
@@ -1323,7 +1319,7 @@ sub index_sync {
                        $art_beg++ if defined($art_beg);
                }
        }
-       if ($sync->{index_max_size} = $self->{ibx}->{index_max_size}) {
+       if ($sync->{max_size} = $opt->{max_size}) {
                $sync->{index_oid} = \&index_oid;
        }
        # work forwards through history