wwwstream: subclass off GzipFilter

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

diff --git a/lib/PublicInbox/Over.pm b/lib/PublicInbox/Over.pm
index e32104f0cf81754bf8ed1d6e8012eb13420f506c..e5a980d59eacae3ba699e06af614cc43e83b2d2a 100644 (file)
--- a/lib/PublicInbox/Over.pm
+++ b/lib/PublicInbox/Over.pm
@@ -19,13 +19,23 @@ sub dbh_new {
        if ($rw && !-f $f) { # SQLite defaults mode to 0644, we want 0666
                open my $fh, '+>>', $f or die "failed to open $f: $!";
        }
-       my $dbh = DBI->connect("dbi:SQLite:dbname=$f",'','', {
-               AutoCommit => 1,
-               RaiseError => 1,
-               PrintError => 0,
-               ReadOnly => !$rw,
-               sqlite_use_immediate_transaction => 1,
-       });
+       my (@st, $st, $dbh);
+       my $tries = 0;
+       do {
+               @st = stat($f) or die "failed to stat $f: $!";
+               $st = pack('dd', $st[0], $st[1]); # 0: dev, 1: inode
+               $dbh = DBI->connect("dbi:SQLite:dbname=$f",'','', {
+                       AutoCommit => 1,
+                       RaiseError => 1,
+                       PrintError => 0,
+                       ReadOnly => !$rw,
+                       sqlite_use_immediate_transaction => 1,
+               });
+               $self->{st} = $st;
+               @st = stat($f) or die "failed to stat $f: $!";
+               $st = pack('dd', $st[0], $st[1]);
+       } while ($st ne $self->{st} && $tries++ < 3);
+       warn "W: $f: .st_dev, .st_ino unstable\n" if $st ne $self->{st};
        $dbh->{sqlite_unicode} = 1;
        $dbh;
 }
@@ -238,25 +248,25 @@ SELECT MAX(num) FROM over WHERE num > 0
        $sth->fetchrow_array // 0;
 }
 
-sub imap_status {
+sub imap_exists {
        my ($self, $uid_base, $uid_end) = @_;
-       my $dbh = $self->connect;
-       my $sth = $dbh->prepare_cached(<<'', undef, 1);
+       my $sth = $self->connect->prepare_cached(<<'', undef, 1);
 SELECT COUNT(num) FROM over WHERE num > ? AND num <= ?
 
        $sth->execute($uid_base, $uid_end);
-       my $exists = $sth->fetchrow_array;
-
-       $sth = $dbh->prepare_cached(<<'', undef, 1);
-SELECT MAX(num) + 1 FROM over WHERE num <= ?
-
-       $sth->execute($uid_end);
-       my $uidnext = $sth->fetchrow_array;
+       $sth->fetchrow_array;
+}
 
-       $sth = $dbh->prepare_cached(<<'', undef, 1);
-SELECT MAX(num) FROM over WHERE num > 0
+sub check_inodes {
+       my ($self) = @_;
+       if (my @st = stat($self->{filename})) { # did st_dev, st_ino change?
+               my $st = pack('dd', $st[0], $st[1]);
 
-       ($exists, $uidnext, $sth->fetchrow_array // 0);
+               # don't actually reopen, just let {dbh} be recreated later
+               delete($self->{dbh}) if ($st ne ($self->{st} // $st));
+       } else {
+               warn "W: stat $self->{filename}: $!\n";
+       }
 }
 
 1;