X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FMsgmap.pm;h=3887a9e6b2c2264a468e9f7903ecf1e68af14b47;hb=d7780e12856d83b9f5c58586691e2fbe711321ed;hp=9d2ef0dc5455f2c239ad54d283fe24a272d23bdc;hpb=0ad076b1943bf7c65868d1db3cef4bd0ea1ef49a;p=public-inbox.git
diff --git a/lib/PublicInbox/Msgmap.pm b/lib/PublicInbox/Msgmap.pm
index 9d2ef0dc..3887a9e6 100644
--- a/lib/PublicInbox/Msgmap.pm
+++ b/lib/PublicInbox/Msgmap.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2015-2020 all contributors
+# Copyright (C) 2015-2021 all contributors
# License: AGPL-3.0+
# bidirectional Message-ID <-> Article Number mapping for the NNTP
@@ -6,14 +6,14 @@
# 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;
sub new {
my ($class, $git_dir, $writable) = @_;
@@ -32,16 +32,11 @@ sub new_file {
my $self = bless { filename => $f }, $class;
my $dbh = $self->{dbh} = PublicInbox::Over::dbh_new($self, $rw);
if ($rw) {
- create_tables($dbh);
-
- # 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;
- my $max = $self->max // 0;
- $self->num_highwater($max);
+ $self->num_highwater(max($self));
$dbh->commit;
}
$self;
@@ -49,14 +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-$$-XXXX";
+ 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->{pid} = $$;
- close $fh or die "failed to close $fn: $!";
$tmp;
}
@@ -94,6 +90,7 @@ sub last_commit_xap {
$self->meta_accessor("last_xap$version-$i", $commit);
}
+# this is the UIDVALIDITY for IMAP (cf. RFC 3501 sec 2.3.1.1. item 3)
sub created_at {
my ($self, $second) = @_;
$self->meta_accessor('created_at', $second);
@@ -146,7 +143,7 @@ sub max {
my $sth = $_[0]->{dbh}->prepare_cached('SELECT MAX(num) FROM msgmap',
undef, 1);
$sth->execute;
- $sth->fetchrow_array;
+ $sth->fetchrow_array // 0;
}
sub minmax {
@@ -155,7 +152,7 @@ sub minmax {
my $sth = $_[0]->{dbh}->prepare_cached('SELECT MIN(num) FROM msgmap',
undef, 1);
$sth->execute;
- ($sth->fetchrow_array, max($_[0]));
+ ($sth->fetchrow_array // 0, max($_[0]));
}
sub mid_delete {
@@ -176,29 +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)');
-}
-# used by NNTP.pm
-sub ids_after {
- my ($self, $num) = @_;
- my $ids = $self->{dbh}->selectcol_arrayref(<<'', undef, $$num);
-SELECT num FROM msgmap WHERE num > ?
-ORDER BY num ASC LIMIT 1000
+ $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
+)
- $$num = $ids->[-1] if @$ids;
- $ids;
}
sub msg_range {
@@ -241,8 +229,8 @@ sub atfork_parent {
$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';
- my $dbh = $self->{dbh} = PublicInbox::Over::dbh_new($self, 1);
- $dbh->do('PRAGMA synchronous = OFF');
+ $self->{dbh} = PublicInbox::Over::dbh_new($self, 2);
+ $self->{dbh}->do('PRAGMA journal_mode = MEMORY');
}
sub atfork_prepare {