X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FOverIdx.pm;h=6f0477f0a7150587e4b64a0bf0470736b8caba75;hb=7f4a11a6499aade26b418b7ae13cd12859f75bdd;hp=d42d6fe76a273f5ed5f839a68a5388efc05eda1f;hpb=ae546078c5696ac73ad9f48c2c90163febb4a246;p=public-inbox.git

diff --git a/lib/PublicInbox/OverIdx.pm b/lib/PublicInbox/OverIdx.pm
index d42d6fe7..6f0477f0 100644
--- a/lib/PublicInbox/OverIdx.pm
+++ b/lib/PublicInbox/OverIdx.pm
@@ -9,25 +9,19 @@
 # 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 {
 	my ($self) = @_;
 	my $dbh = $self->SUPER::dbh_new($self->{-no_fsync} ? 2 : 1);
 
-	# TRUNCATE reduces I/O compared to the default (DELETE)
-	# We do not use WAL since we're optimized for read-only ops,
-	# (and read-only requires SQLite 3.22.0 (2018-01-22)).
-	$dbh->do('PRAGMA journal_mode = TRUNCATE');
-
 	# 80000 pages (80MiB on SQLite <3.12.0, 320MiB on 3.12.0+)
 	# was found to be good in 2018 during the large LKML import
 	# at the time.  This ought to be configurable based on HW
@@ -190,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 {
@@ -448,7 +439,7 @@ sub commit_lazy {
 sub begin_lazy {
 	my ($self) = @_;
 	return if $self->{txn};
-	my $dbh = $self->connect or return;
+	my $dbh = $self->dbh or return;
 	$dbh->begin_work;
 	# $dbh->{Profile} = 2;
 	$self->{txn} = 1;
@@ -460,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 {
@@ -474,8 +465,8 @@ sub create {
 		File::Path::mkpath(File::Basename::dirname($self->{filename}));
 	}
 	# create the DB:
-	PublicInbox::Over::connect($self);
-	$self->disconnect;
+	PublicInbox::Over::dbh($self);
+	$self->dbh_close;
 }
 
 sub rethread_prepare {