disambiguate OverIdx and Over by field name

We'll use {oidx} as the common field name for the read-write
OverIdx, here, to disambiguate it from the read-only {over}
field.  This hopefully makes it clearer which code paths are
read-only and which are read-write.

diff --git a/lib/PublicInbox/SearchIdx.pm b/lib/PublicInbox/SearchIdx.pm
index 3f2da6ab5647ba91fb58ba98972f27927cd605a3..eb620f44fe990e4c38514d9375fa6328ae30e80d 100644 (file)
--- a/lib/PublicInbox/SearchIdx.pm
+++ b/lib/PublicInbox/SearchIdx.pm
@@ -69,8 +69,8 @@ sub new {
        if ($version == 1) {
                $self->{lock_path} = "$inboxdir/ssoma.lock";
                my $dir = $self->xdir;
-               $self->{over} = PublicInbox::OverIdx->new("$dir/over.sqlite3");
-               $self->{over}->{-no_fsync} = 1 if $ibx->{-no_fsync};
+               $self->{oidx} = PublicInbox::OverIdx->new("$dir/over.sqlite3");
+               $self->{oidx}->{-no_fsync} = 1 if $ibx->{-no_fsync};
        } elsif ($version == 2) {
                defined $shard or die "shard is required for v2\n";
                # shard is a number
@@ -419,8 +419,8 @@ sub add_message {
                # of the fields which exist in over.sqlite3.  We may stop
                # storing doc_data in Xapian sometime after we get multi-inbox
                # search working.
-               if (my $over = $self->{over}) { # v1 only
-                       $over->add_overview($mime, $smsg);
+               if (my $oidx = $self->{oidx}) { # v1 only
+                       $oidx->add_overview($mime, $smsg);
                }
                if (need_xapian($self)) {
                        add_xapian($self, $mime, $smsg, $mids);
@@ -457,7 +457,7 @@ sub xdb_remove {
 
 sub remove_by_oid {
        my ($self, $oid, $num) = @_;
-       die "BUG: remove_by_oid is v2-only\n" if $self->{over};
+       die "BUG: remove_by_oid is v2-only\n" if $self->{oidx};
        $self->begin_txn_lazy;
        xdb_remove($self, $oid, $num) if need_xapian($self);
 }
@@ -479,13 +479,9 @@ sub unindex_eml {
        my $nr = 0;
        my %tmp;
        for my $mid (@$mids) {
-               my @removed = eval { $self->{over}->remove_oid($oid, $mid) };
-               if ($@) {
-                       warn "E: failed to remove <$mid> from overview: $@\n";
-               } else {
-                       $nr += scalar @removed;
-                       $tmp{$_}++ for @removed;
-               }
+               my @removed = $self->{oidx}->remove_oid($oid, $mid);
+               $nr += scalar @removed;
+               $tmp{$_}++ for @removed;
        }
        if (!$nr) {
                $mids = join('> <', @$mids);
@@ -507,9 +503,9 @@ sub index_mm {
        my $mids = mids($mime);
        my $mm = $self->{mm};
        if ($sync->{reindex}) {
-               my $over = $self->{over};
+               my $oidx = $self->{oidx};
                for my $mid (@$mids) {
-                       my ($num, undef) = $over->num_mid0_for_oid($oid, $mid);
+                       my ($num, undef) = $oidx->num_mid0_for_oid($oid, $mid);
                        return $num if defined $num;
                }
                $mm->num_for($mids->[0]) // $mm->mid_insert($mids->[0]);
@@ -603,7 +599,7 @@ sub v1_checkpoint ($$;$) {
                }
        }
 
-       $self->{over}->rethread_done($sync->{-opt}) if $newest; # all done
+       $self->{oidx}->rethread_done($sync->{-opt}) if $newest; # all done
        commit_txn_lazy($self);
        $self->{ibx}->git->cleanup;
        my $nr = ${$sync->{nr}};
@@ -773,7 +769,7 @@ sub _index_sync {
        my $pr = $opt->{-progress};
        my $sync = { reindex => $opt->{reindex}, -opt => $opt };
        my $xdb = $self->begin_txn_lazy;
-       $self->{over}->rethread_prepare($opt);
+       $self->{oidx}->rethread_prepare($opt);
        my $mm = _msgmap_init($self);
        if ($sync->{reindex}) {
                my $last = $mm->last_commit;
@@ -804,7 +800,7 @@ sub DESTROY {
 sub _begin_txn {
        my ($self) = @_;
        my $xdb = $self->{xdb} || idx_acquire($self);
-       $self->{over}->begin_lazy if $self->{over};
+       $self->{oidx}->begin_lazy if $self->{oidx};
        $xdb->begin_transaction if $xdb;
        $self->{txn} = 1;
        $xdb;
@@ -844,7 +840,7 @@ sub _commit_txn {
                set_metadata_once($self);
                $xdb->commit_transaction;
        }
-       $self->{over}->commit_lazy if $self->{over};
+       $self->{oidx}->commit_lazy if $self->{oidx};
 }
 
 sub commit_txn_lazy {

diff --git a/lib/PublicInbox/V2Writable.pm b/lib/PublicInbox/V2Writable.pm
index 553dd839f39a9a56227e8a092d55e791ca54b2e0..c8334645d3cbcff5bf0b290bda75db7bd8113022 100644 (file)
--- a/lib/PublicInbox/V2Writable.pm
+++ b/lib/PublicInbox/V2Writable.pm
@@ -114,13 +114,13 @@ sub new {
                total_bytes => 0,
                current_info => '',
                xpfx => $xpfx,
-               over => PublicInbox::OverIdx->new("$xpfx/over.sqlite3"),
+               oidx => PublicInbox::OverIdx->new("$xpfx/over.sqlite3"),
                lock_path => "$dir/inbox.lock",
                # limit each git repo (epoch) to 1GB or so
                rotate_bytes => int((1024 * 1024 * 1024) / $PACKING_FACTOR),
                last_commit => [], # git epoch -> commit
        };
-       $self->{over}->{-no_fsync} = 1 if $v2ibx->{-no_fsync};
+       $self->{oidx}->{-no_fsync} = 1 if $v2ibx->{-no_fsync};
        $self->{shards} = count_shards($self) || nproc_shards($creat);
        bless $self, $class;
 }
@@ -154,7 +154,7 @@ sub add {
 sub do_idx ($$$$) {
        my ($self, $msgref, $mime, $smsg) = @_;
        $smsg->{bytes} = $smsg->{raw_bytes} + crlf_adjust($$msgref);
-       $self->{over}->add_overview($mime, $smsg);
+       $self->{oidx}->add_overview($mime, $smsg);
        my $idx = idx_shard($self, $smsg->{num} % $self->{shards});
        $idx->index_raw($msgref, $mime, $smsg);
        my $n = $self->{transact_bytes} += $smsg->{raw_bytes};
@@ -219,7 +219,7 @@ sub v2_num_for {
                if ($altid && grep(/:file=msgmap\.sqlite3\z/, @$altid)) {
                        my $num = $self->{mm}->num_for($mid);
 
-                       if (defined $num && !$self->{over}->get_art($num)) {
+                       if (defined $num && !$self->{oidx}->get_art($num)) {
                                return ($num, $mid);
                        }
                }
@@ -274,7 +274,7 @@ sub idx_shard {
 sub _idx_init { # with_umask callback
        my ($self, $opt) = @_;
        $self->lock_acquire unless $opt && $opt->{-skip_lock};
-       $self->{over}->create;
+       $self->{oidx}->create;
 
        # xcpdb can change shard count while -watch is idle
        my $nshards = count_shards($self);
@@ -381,7 +381,7 @@ sub rewrite_internal ($$;$$$) {
        } else {
                $im = $self->importer;
        }
-       my $over = $self->{over};
+       my $oidx = $self->{oidx};
        my $chashes = content_hashes($old_eml);
        my $removed = [];
        my $mids = mids($old_eml);
@@ -395,7 +395,7 @@ sub rewrite_internal ($$;$$$) {
        foreach my $mid (@$mids) {
                my %gone; # num => [ smsg, $mime, raw ]
                my ($id, $prev);
-               while (my $smsg = $over->next_by_mid($mid, \$id, \$prev)) {
+               while (my $smsg = $oidx->next_by_mid($mid, \$id, \$prev)) {
                        my $msg = get_blob($self, $smsg);
                        if (!defined($msg)) {
                                warn "broken smsg for $mid\n";
@@ -623,7 +623,7 @@ sub checkpoint ($;$) {
                $dbh->commit;
 
                # SQLite overview is third
-               $self->{over}->commit_lazy;
+               $self->{oidx}->commit_lazy;
 
                # Now deal with Xapian
                if ($wait) {
@@ -682,7 +682,7 @@ sub done {
                        $err .= "shard close: $@\n" if $@;
                }
        }
-       eval { $self->{over}->dbh_close };
+       eval { $self->{oidx}->dbh_close };
        $err .= "over close: $@\n" if $@;
        delete $self->{bnote};
        my $nbytes = $self->{total_bytes};
@@ -844,10 +844,10 @@ sub get_blob ($$) {
 
 sub content_exists ($$$) {
        my ($self, $mime, $mid) = @_;
-       my $over = $self->{over};
+       my $oidx = $self->{oidx};
        my $chashes = content_hashes($mime);
        my ($id, $prev);
-       while (my $smsg = $over->next_by_mid($mid, \$id, \$prev)) {
+       while (my $smsg = $oidx->next_by_mid($mid, \$id, \$prev)) {
                my $msg = get_blob($self, $smsg);
                if (!defined($msg)) {
                        warn "broken smsg for $mid\n";
@@ -917,9 +917,9 @@ sub index_oid { # cat_async callback
                }
        }
        if (!defined($num)) { # reuse if reindexing (or duplicates)
-               my $over = $self->{over};
+               my $oidx = $self->{oidx};
                for my $mid (@$mids) {
-                       ($num, $mid0) = $over->num_mid0_for_oid($oid, $mid);
+                       ($num, $mid0) = $oidx->num_mid0_for_oid($oid, $mid);
                        last if defined $num;
                }
        }
@@ -1107,7 +1107,7 @@ sub sync_prepare ($$$) {
 
 sub unindex_oid_remote ($$$) {
        my ($self, $oid, $mid) = @_;
-       my @removed = $self->{over}->remove_oid($oid, $mid);
+       my @removed = $self->{oidx}->remove_oid($oid, $mid);
        for my $num (@removed) {
                my $idx = idx_shard($self, $num % $self->{shards});
                $idx->shard_remove($oid, $num);
@@ -1121,11 +1121,11 @@ sub unindex_oid ($$;$) { # git->cat_async callback
        my $mm = $self->{mm};
        my $mids = mids(PublicInbox::Eml->new($bref));
        undef $$bref;
-       my $over = $self->{over};
+       my $oidx = $self->{oidx};
        foreach my $mid (@$mids) {
                my %gone;
                my ($id, $prev);
-               while (my $smsg = $over->next_by_mid($mid, \$id, \$prev)) {
+               while (my $smsg = $oidx->next_by_mid($mid, \$id, \$prev)) {
                        $gone{$smsg->{num}} = 1 if $oid eq $smsg->{blob};
                }
                my $n = scalar(keys(%gone)) or next;
@@ -1299,7 +1299,7 @@ sub index_sync {
 
        $self->idx_init($opt); # acquire lock
        fill_alternates($self, $epoch_max);
-       $self->{over}->rethread_prepare($opt);
+       $self->{oidx}->rethread_prepare($opt);
        my $sync = {
                need_checkpoint => \(my $bool = 0),
                unindex_range => {}, # EPOCH => oid_old..oid_new
@@ -1329,7 +1329,7 @@ sub index_sync {
        }
        # work forwards through history
        index_epoch($self, $sync, $_) for (0..$epoch_max);
-       $self->{over}->rethread_done($opt);
+       $self->{oidx}->rethread_done($opt);
        $self->done;
 
        if (my $nr = $sync->{nr}) {

diff --git a/t/search-thr-index.t b/t/search-thr-index.t
index b5a5ff1fbb9b9651e6211f9dca031d38e5b47654..bd663519d0c97b912714a5f857a3ca28f65c26db 100644 (file)
--- a/t/search-thr-index.t
+++ b/t/search-thr-index.t
@@ -60,9 +60,9 @@ foreach (reverse split(/\n\n/, $data)) {
 
 my $prev;
 my %tids;
-my $dbh = $rw->{over}->dbh;
+my $dbh = $rw->{oidx}->dbh;
 foreach my $mid (@mids) {
-       my $msgs = $rw->{over}->get_thread($mid);
+       my $msgs = $rw->{oidx}->get_thread($mid);
        is(3, scalar(@$msgs), "got all messages from $mid");
        foreach my $m (@$msgs) {
                my $tid = $dbh->selectrow_array(<<'', undef, $m->{num});
@@ -84,9 +84,9 @@ Message-Id: <1-bw@g>
 From: bw@g
 To: git@vger.kernel.org
 
-       my $dbh = $rw->{over}->dbh;
+       my $dbh = $rw->{oidx}->dbh;
        my ($id, $prev);
-       my $reidx = $rw->{over}->next_by_mid('1-bw@g', \$id, \$prev);
+       my $reidx = $rw->{oidx}->next_by_mid('1-bw@g', \$id, \$prev);
        ok(defined $reidx);
        my $num = $reidx->{num};
        my $tid0 = $dbh->selectrow_array(<<'', undef, $num);

diff --git a/t/search.t b/t/search.t
index e2290ecd8a24600709302871913ae0ed3b843f4b..f026e5093c9176d00f7bd39487d919caff6baa27 100644 (file)
--- a/t/search.t
+++ b/t/search.t
@@ -161,7 +161,7 @@ are real
 EOF
        my $ghost_id = $rw->add_message($was_ghost);
        is($ghost_id, int($ghost_id), "ghost_id is an integer: $ghost_id");
-       my $msgs = $rw->{over}->get_thread('ghost-message@s');
+       my $msgs = $rw->{oidx}->get_thread('ghost-message@s');
        is(scalar(@$msgs), 2, 'got both messages in ghost thread');
        foreach (qw(sid tid)) {
                is($msgs->[0]->{$_}, $msgs->[1]->{$_}, "{$_} match");