searchidx: use v5.10.1, parent.pm, drop warnings

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

diff --git a/lib/PublicInbox/SearchIdx.pm b/lib/PublicInbox/SearchIdx.pm
index 00e63938fc068f6eb6c8e0199fc16130f96426d4..9550847b784c42d96da03e44688c377d20c1be71 100644 (file)
--- a/lib/PublicInbox/SearchIdx.pm
+++ b/lib/PublicInbox/SearchIdx.pm
@@ -8,8 +8,8 @@
 # This writes to the search index.
 package PublicInbox::SearchIdx;
 use strict;
-use warnings;
-use base qw(PublicInbox::Search PublicInbox::Lock);
+use v5.10.1;
+use parent qw(PublicInbox::Search PublicInbox::Lock);
 use PublicInbox::Eml;
 use PublicInbox::InboxWritable;
 use PublicInbox::MID qw/mid_clean mid_mime mids_for_index/;
@@ -78,12 +78,12 @@ sub new {
 sub need_xapian ($) { $_[0]->{indexlevel} =~ $xapianlevels }
 
 sub _xdb_release {
-       my ($self) = @_;
+       my ($self, $wake) = @_;
        if (need_xapian($self)) {
                my $xdb = delete $self->{xdb} or croak 'not acquired';
                $xdb->close;
        }
-       $self->lock_release if $self->{creat};
+       $self->lock_release($wake) if $self->{creat};
        undef;
 }
 
@@ -585,7 +585,7 @@ sub unindex_both { # git->cat_async callback
 sub index_sync {
        my ($self, $opts) = @_;
        delete $self->{lock_path} if $opts->{-skip_lock};
-       $self->{-inbox}->with_umask(sub { $self->_index_sync($opts) })
+       $self->{-inbox}->with_umask(\&_index_sync, $self, $opts);
 }
 
 sub too_big ($$$) {
@@ -800,7 +800,7 @@ sub _index_sync {
                }
                $self->commit_txn_lazy;
                $git->cleanup;
-               $xdb = _xdb_release($self);
+               $xdb = _xdb_release($self, $nr);
                # let another process do some work... <
                $pr->("indexed $nr/$self->{ntodo}\n") if $pr && $nr;
                if (!$newest) {
@@ -854,17 +854,18 @@ sub remote_remove {
        }
 }
 
-sub begin_txn_lazy {
+sub _begin_txn {
        my ($self) = @_;
-       return if $self->{txn};
+       my $xdb = $self->{xdb} || $self->_xdb_acquire;
+       $self->{over}->begin_lazy if $self->{over};
+       $xdb->begin_transaction if $xdb;
+       $self->{txn} = 1;
+       $xdb;
+}
 
-       $self->{-inbox}->with_umask(sub {
-               my $xdb = $self->{xdb} || $self->_xdb_acquire;
-               $self->{over}->begin_lazy if $self->{over};
-               $xdb->begin_transaction if $xdb;
-               $self->{txn} = 1;
-               $xdb;
-       });
+sub begin_txn_lazy {
+       my ($self) = @_;
+       $self->{-inbox}->with_umask(\&_begin_txn, $self) if !$self->{txn};
 }
 
 # store 'indexlevel=medium' in v2 shard=0 and v1 (only one shard)
@@ -882,16 +883,19 @@ sub set_indexlevel {
        }
 }
 
+sub _commit_txn {
+       my ($self) = @_;
+       if (my $xdb = $self->{xdb}) {
+               set_indexlevel($self);
+               $xdb->commit_transaction;
+       }
+       $self->{over}->commit_lazy if $self->{over};
+}
+
 sub commit_txn_lazy {
        my ($self) = @_;
-       delete $self->{txn} or return;
-       $self->{-inbox}->with_umask(sub {
-               if (my $xdb = $self->{xdb}) {
-                       set_indexlevel($self);
-                       $xdb->commit_transaction;
-               }
-               $self->{over}->commit_lazy if $self->{over};
-       });
+       delete($self->{txn}) and
+               $self->{-inbox}->with_umask(\&_commit_txn, $self);
 }
 
 sub worker_done {