overidx: inline create_ghost sub

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

diff --git a/lib/PublicInbox/OverIdx.pm b/lib/PublicInbox/OverIdx.pm
index c521464a7447cc5725f7c5db11b6bde56493cd34..6f0477f0a7150587e4b64a0bf0470736b8caba75 100644 (file)
--- a/lib/PublicInbox/OverIdx.pm
+++ b/lib/PublicInbox/OverIdx.pm
@@ -9,14 +9,13 @@
 # are denoted by a negative NNTP article number.
 package PublicInbox::OverIdx;
 use strict;
-use warnings;
-use base qw(PublicInbox::Over);
+use v5.10.1;
+use parent qw(PublicInbox::Over);
 use IO::Handle;
 use DBI qw(:sql_types); # SQL_BLOB
 use PublicInbox::MID qw/id_compress mids_for_index references/;
 use PublicInbox::Smsg qw(subject_normalized);
 use Compress::Zlib qw(compress);
-use PublicInbox::Search;
 use Carp qw(croak);
 
 sub dbh_new {
@@ -185,23 +184,20 @@ sub resolve_mid_to_tid {
        if (my $del = delete $self->{-ghosts_to_delete}) {
                delete_by_num($self, $_) for @$del;
        }
-       $tid // create_ghost($self, $mid);
-}
-
-sub create_ghost {
-       my ($self, $mid) = @_;
-       my $id = mid2id($self, $mid);
-       my $num = next_ghost_num($self);
-       $num < 0 or die "ghost num is non-negative: $num\n";
-       my $tid = next_tid($self);
-       my $dbh = $self->{dbh};
-       $dbh->prepare_cached(<<'')->execute($num, $tid);
+       $tid // do { # create a new ghost
+               my $id = mid2id($self, $mid);
+               my $num = next_ghost_num($self);
+               $num < 0 or die "ghost num is non-negative: $num\n";
+               $tid = next_tid($self);
+               my $dbh = $self->{dbh};
+               $dbh->prepare_cached(<<'')->execute($num, $tid);
 INSERT INTO over (num, tid) VALUES (?,?)
 
-       $dbh->prepare_cached(<<'')->execute($id, $num);
+               $dbh->prepare_cached(<<'')->execute($id, $num);
 INSERT INTO id2num (id, num) VALUES (?,?)
 
-       $tid;
+               $tid;
+       };
 }
 
 sub merge_threads {
@@ -455,10 +451,10 @@ sub rollback_lazy {
        $self->{dbh}->rollback;
 }
 
-sub disconnect {
+sub dbh_close {
        my ($self) = @_;
        die "in transaction" if $self->{txn};
-       $self->SUPER::disconnect;
+       $self->SUPER::dbh_close;
 }
 
 sub create {
@@ -470,7 +466,7 @@ sub create {
        }
        # create the DB:
        PublicInbox::Over::dbh($self);
-       $self->disconnect;
+       $self->dbh_close;
 }
 
 sub rethread_prepare {