X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FMsgmap.pm;h=1041cd177ed2dbb5589228354b29a1bf0b2eccd4;hb=4eee5af6011cc8cdefb66c9729952c7eff5c0b0b;hp=de9fd989d1f46e12ae89d33abcb22a06bddf0206;hpb=83d92d71381e08ec84eafb28ff29193955aa80c3;p=public-inbox.git

diff --git a/lib/PublicInbox/Msgmap.pm b/lib/PublicInbox/Msgmap.pm
index de9fd989..1041cd17 100644
--- 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 {
@@ -257,21 +261,10 @@ 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";
-	}
+	$self->{dbh} // return;
+	my $rw = !$self->{dbh}->{ReadOnly};
+	PublicInbox::Over::check_inodes($self);
+	$self->{dbh} //= PublicInbox::Over::dbh_new($self, !$rw);
 }
 
 1;