X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FMsgmap.pm;h=d28e96c8588b002e62a09b64dc6eaaad51346309;hb=5f6a0d2342323541e44ff2f1e7329053d0263800;hp=aa07e344c6a9d75a9b376af5a6fbbd5911481198;hpb=5759c29ba5e0c8b2b1135e528e133dc7dde219f8;p=public-inbox.git

diff --git a/lib/PublicInbox/Msgmap.pm b/lib/PublicInbox/Msgmap.pm
index aa07e344..d28e96c8 100644
--- a/lib/PublicInbox/Msgmap.pm
+++ b/lib/PublicInbox/Msgmap.pm
@@ -9,10 +9,10 @@
 # This is maintained by ::SearchIdx
 package PublicInbox::Msgmap;
 use strict;
-use warnings;
 use DBI;
 use DBD::SQLite;
-use File::Temp qw(tempfile);
+use PublicInbox::Over;
+use PublicInbox::Spawn;
 
 sub new {
 	my ($class, $git_dir, $writable) = @_;
@@ -24,35 +24,15 @@ sub new {
 	new_file($class, "$d/msgmap.sqlite3", $writable);
 }
 
-sub dbh_new {
-	my ($f, $writable) = @_;
-	if ($writable && !-f $f) { # SQLite defaults mode to 0644, we want 0666
-		open my $fh, '+>>', $f or die "failed to open $f: $!";
-	}
-	my $dbh = DBI->connect("dbi:SQLite:dbname=$f",'','', {
-		AutoCommit => 1,
-		RaiseError => 1,
-		PrintError => 0,
-		ReadOnly => !$writable,
-		sqlite_use_immediate_transaction => 1,
-	});
-	$dbh;
-}
-
 sub new_file {
-	my ($class, $f, $writable) = @_;
-	return if !$writable && !-r $f;
-
-	my $dbh = dbh_new($f, $writable);
-	my $self = bless { dbh => $dbh }, $class;
-
-	if ($writable) {
-		create_tables($dbh);
-
-		# TRUNCATE reduces I/O compared to the default (DELETE)
-		$dbh->do('PRAGMA journal_mode = TRUNCATE');
+	my ($class, $f, $rw) = @_;
+	return if !$rw && !-r $f;
 
+	my $self = bless { filename => $f }, $class;
+	my $dbh = $self->{dbh} = PublicInbox::Over::dbh_new($self, $rw);
+	if ($rw) {
 		$dbh->begin_work;
+		create_tables($dbh);
 		$self->created_at(time) unless $self->created_at;
 
 		my $max = $self->max // 0;
@@ -64,15 +44,15 @@ sub new_file {
 
 # used to keep track of used numeric mappings for v2 reindex
 sub tmp_clone {
-	my ($self) = @_;
-	my ($fh, $fn) = tempfile('msgmap-XXXXXXXX', EXLOCK => 0, TMPDIR => 1);
+	my ($self, $dir) = @_;
+	require File::Temp;
+	my $tmp = "mm_tmp-$$-XXXXXX";
+	my ($fh, $fn) = File::Temp::tempfile($tmp, EXLOCK => 0, DIR => $dir);
+	PublicInbox::Spawn::nodatacow_fd(fileno($fh));
 	$self->{dbh}->sqlite_backup_to_file($fn);
-	my $tmp = ref($self)->new_file($fn, 1);
-	$tmp->{dbh}->do('PRAGMA synchronous = OFF');
+	$tmp = ref($self)->new_file($fn, 2);
 	$tmp->{dbh}->do('PRAGMA journal_mode = MEMORY');
-	$tmp->{tmp_name} = $fn; # SQLite won't work if unlinked, apparently
 	$tmp->{pid} = $$;
-	close $fh or die "failed to close $fn: $!";
 	$tmp;
 }
 
@@ -192,18 +172,20 @@ sub num_delete {
 
 sub create_tables {
 	my ($dbh) = @_;
-	my $e;
-
-	$e = eval { $dbh->selectrow_array('EXPLAIN SELECT * FROM msgmap;') };
-	defined $e or $dbh->do('CREATE TABLE msgmap (' .
-			'num INTEGER PRIMARY KEY AUTOINCREMENT, '.
-			'mid VARCHAR(1000) NOT NULL, ' .
-			'UNIQUE (mid) )');
-
-	$e = eval { $dbh->selectrow_array('EXPLAIN SELECT * FROM meta') };
-	defined $e or $dbh->do('CREATE TABLE meta (' .
-			'key VARCHAR(32) PRIMARY KEY, '.
-			'val VARCHAR(255) NOT NULL)');
+
+	$dbh->do(<<'');
+CREATE TABLE IF NOT EXISTS msgmap (
+	num INTEGER PRIMARY KEY AUTOINCREMENT,
+	mid VARCHAR(1000) NOT NULL,
+	UNIQUE (mid)
+)
+
+	$dbh->do(<<'');
+CREATE TABLE IF NOT EXISTS meta (
+	key VARCHAR(32) PRIMARY KEY,
+	val VARCHAR(255) NOT NULL
+)
+
 }
 
 # used by NNTP.pm
@@ -245,29 +227,30 @@ sub mid_set {
 
 sub DESTROY {
 	my ($self) = @_;
-	delete $self->{dbh};
-	my $f = delete $self->{tmp_name};
-	if (defined $f && $self->{pid} == $$) {
+	my $dbh = $self->{dbh} or return;
+	if (($self->{pid} // 0) == $$) {
+		my $f = $dbh->sqlite_db_filename;
 		unlink $f or warn "failed to unlink $f: $!\n";
 	}
 }
 
 sub atfork_parent {
 	my ($self) = @_;
-	my $f = $self->{tmp_name} or die "not a temporary clone\n";
-	delete $self->{dbh} and die "tmp_clone dbh not prepared for parent";
-	my $dbh = $self->{dbh} = dbh_new($f, 1);
-	$dbh->do('PRAGMA synchronous = OFF');
+	$self->{pid} or die 'BUG: not a temporary clone';
+	$self->{dbh} and die 'BUG: tmp_clone dbh not prepared for parent';
+	defined($self->{filename}) or die 'BUG: {filename} not defined';
+	$self->{dbh} = PublicInbox::Over::dbh_new($self, 2);
+	$self->{dbh}->do('PRAGMA journal_mode = MEMORY');
 }
 
 sub atfork_prepare {
 	my ($self) = @_;
-	my $f = $self->{tmp_name} or die "not a temporary clone\n";
-	$self->{pid} == $$ or
-		die "BUG: atfork_prepare not called from $self->{pid}\n";
-	$self->{dbh} or die "temporary clone not open\n";
+	my $pid = $self->{pid} or die 'BUG: not a temporary clone';
+	$pid == $$ or die "BUG: atfork_prepare not called by $pid";
+	my $dbh = $self->{dbh} or die 'BUG: temporary clone not open';
+
 	# must clobber prepared statements
-	%$self = (tmp_name => $f, pid => $$);
+	%$self = (filename => $dbh->sqlite_db_filename, pid => $pid);
 }
 
 sub skip_artnum {
@@ -296,4 +279,23 @@ sub skip_artnum {
 	}
 }
 
+sub check_inodes {
+	my ($self) = @_;
+	# no filename if in-:memory:
+	my $f = $self->{dbh}->sqlite_db_filename // return;
+	if (my @st = stat($f)) { # did st_dev, st_ino change?
+		my $st = pack('dd', $st[0], $st[1]);
+		if ($st ne ($self->{st} // $st)) {
+			my $tmp = eval { ref($self)->new_file($f) };
+			if ($@) {
+				warn "E: DBI->connect($f): $@\n";
+			} else {
+				%$self = %$tmp;
+			}
+		}
+	} else {
+		warn "W: stat $f: $!\n";
+	}
+}
+
 1;