No ext_urls

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

diff --git a/lib/PublicInbox/Msgmap.pm b/lib/PublicInbox/Msgmap.pm
index 978730e2fe59deb6966acaf37f0bc3596eb0c402..cb4bb2956ba2e6f856596a7dffccf7d6a888b34b 100644 (file)
--- a/lib/PublicInbox/Msgmap.pm
+++ b/lib/PublicInbox/Msgmap.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2015-2021 all contributors <meta@public-inbox.org>
+# Copyright (C) all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 
 # bidirectional Message-ID <-> Article Number mapping for the NNTP
@@ -13,20 +13,17 @@ use v5.10.1;
 use DBI;
 use DBD::SQLite;
 use PublicInbox::Over;
-use PublicInbox::Spawn;
-
-sub new {
-       my ($class, $git_dir, $writable) = @_;
-       my $d = "$git_dir/public-inbox";
-       if ($writable && !-d $d && !mkdir $d) {
-               my $err = $!;
-               -d $d or die "$d not created: $err";
-       }
-       new_file($class, "$d/msgmap.sqlite3", $writable);
-}
+use Scalar::Util qw(blessed);
 
 sub new_file {
-       my ($class, $f, $rw) = @_;
+       my ($class, $ibx, $rw) = @_;
+       my $f;
+       if (blessed($ibx)) {
+               $f = $ibx->mm_file;
+               $rw = 2 if $rw && $ibx->{-no_fsync};
+       } else {
+               $f = $ibx;
+       }
        return if !$rw && !-r $f;
 
        my $self = bless { filename => $f }, $class;
@@ -34,8 +31,15 @@ sub new_file {
        if ($rw) {
                $dbh->begin_work;
                create_tables($dbh);
-               $self->created_at(time) unless $self->created_at;
+               unless ($self->created_at) {
+                       my $t;
 
+                       if (blessed($ibx) &&
+                               -f "$ibx->{inboxdir}/inbox.config.example") {
+                               $t = (stat(_))[9]; # mtime set by "curl -R"
+                       }
+                       $self->created_at($t // time);
+               }
                $self->num_highwater(max($self));
                $dbh->commit;
        }
@@ -48,7 +52,8 @@ sub tmp_clone {
        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));
+       require PublicInbox::Syscall;
+       PublicInbox::Syscall::nodatacow_fh($fh);
        $self->{dbh}->sqlite_backup_to_file($fn);
        $tmp = ref($self)->new_file($fn, 2);
        $tmp->{dbh}->do('PRAGMA journal_mode = MEMORY');
@@ -95,13 +100,12 @@ sub created_at {
 
 sub num_highwater {
        my ($self, $num) = @_;
-       my $high = $self->{num_highwater} ||=
-           $self->meta_accessor('num_highwater');
+       my $high = $self->meta_accessor('num_highwater');
        if (defined($num) && (!defined($high) || ($num > $high))) {
-               $self->{num_highwater} = $num;
+               $high = $num;
                $self->meta_accessor('num_highwater', $num);
        }
-       $self->{num_highwater};
+       $high
 }
 
 sub mid_insert {
@@ -140,13 +144,17 @@ sub max {
        $sth->fetchrow_array // 0;
 }
 
-sub minmax {
-       # breaking MIN and MAX into separate queries speeds up from 250ms
-       # to around 700us with 2.7million messages.
+sub min {
        my $sth = $_[0]->{dbh}->prepare_cached('SELECT MIN(num) FROM msgmap',
                                                undef, 1);
        $sth->execute;
-       ($sth->fetchrow_array // 0, max($_[0]));
+       $sth->fetchrow_array // 0;
+}
+
+sub minmax {
+       # breaking MIN and MAX into separate queries speeds up from 250ms
+       # to around 700us with 2.7million messages.
+       (min($_[0]), max($_[0]));
 }
 
 sub mid_delete {