msgmap: use v5.10.1

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

diff --git a/lib/PublicInbox/Msgmap.pm b/lib/PublicInbox/Msgmap.pm
index c85e7796cbd4512f2c286628a4eff8f04aed9388..d696ce837395bcbc0800a09e41290f8f1e5fee02 100644 (file)
--- a/lib/PublicInbox/Msgmap.pm
+++ b/lib/PublicInbox/Msgmap.pm
@@ -6,13 +6,12 @@
 # numbers for NNTP and allows prefix lookups for partial Message-IDs
 # in case URLs get truncated from copy-n-paste errors by users.
 #
-# This is maintained by ::SearchIdx
+# This is maintained by ::SearchIdx (v1) and ::V2Writable (v2)
 package PublicInbox::Msgmap;
 use strict;
-use warnings;
+use v5.10.1;
 use DBI;
 use DBD::SQLite;
-use File::Temp qw(tempfile);
 use PublicInbox::Over;
 use PublicInbox::Spawn;
 
@@ -33,9 +32,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 +46,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);
-       PublicInbox::Spawn::set_nodatacow(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');
-       }
+       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);
+       $tmp = ref($self)->new_file($fn, 2);
+       $tmp->{dbh}->do('PRAGMA journal_mode = MEMORY');
        $tmp->{pid} = $$;
        $tmp;
 }
@@ -182,18 +173,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
@@ -248,6 +241,7 @@ sub atfork_parent {
        $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 {