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

diff --git a/lib/PublicInbox/Msgmap.pm b/lib/PublicInbox/Msgmap.pm
index e7f7e2c9..d28e96c8 100644
--- a/lib/PublicInbox/Msgmap.pm
+++ b/lib/PublicInbox/Msgmap.pm
@@ -9,10 +9,8 @@
 # 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;
 
@@ -33,9 +31,6 @@ sub new_file {
 	my $self = bless { filename => $f }, $class;
 	my $dbh = $self->{dbh} = PublicInbox::Over::dbh_new($self, $rw);
 	if ($rw) {
-		# TRUNCATE reduces I/O compared to the default (DELETE)
-		$dbh->do('PRAGMA journal_mode = TRUNCATE');
-
 		$dbh->begin_work;
 		create_tables($dbh);
 		$self->created_at(time) unless $self->created_at;
@@ -50,18 +45,13 @@ sub new_file {
 # used to keep track of used numeric mappings for v2 reindex
 sub tmp_clone {
 	my ($self, $dir) = @_;
-	my ($fh, $fn) = tempfile('msgmap-XXXXXXXX', EXLOCK => 0, DIR => $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));
-	my $tmp;
-	if ($self->{dbh}->can('sqlite_backup_to_dbh')) {
-		$tmp = ref($self)->new_file($fn, 2);
-		$tmp->{dbh}->do('PRAGMA journal_mode = MEMORY');
-		$self->{dbh}->sqlite_backup_to_dbh($tmp->{dbh});
-	} else { # DBD::SQLite <= 1.61_01
-		$self->{dbh}->sqlite_backup_to_file($fn);
-		$tmp = ref($self)->new_file($fn, 2);
-		$tmp->{dbh}->do('PRAGMA journal_mode = MEMORY');
-	}
+	$self->{dbh}->sqlite_backup_to_file($fn);
+	$tmp = ref($self)->new_file($fn, 2);
+	$tmp->{dbh}->do('PRAGMA journal_mode = MEMORY');
 	$tmp->{pid} = $$;
 	$tmp;
 }
@@ -182,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