X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FOver.pm;h=2b314882bc4d9546ab567d523c8c9878d89b6d7b;hb=683e5fbbfef867ff04b376b3d5230976004a6c7a;hp=598c9fcba18f53cd0e5a2e11c25f268eaede369c;hpb=b0e5062d43a96372801713ef78a78d6a1bc852bc;p=public-inbox.git diff --git a/lib/PublicInbox/Over.pm b/lib/PublicInbox/Over.pm index 598c9fcb..2b314882 100644 --- a/lib/PublicInbox/Over.pm +++ b/lib/PublicInbox/Over.pm @@ -1,4 +1,4 @@ -# Copyright (C) 2018 all contributors +# Copyright (C) 2018-2020 all contributors # License: AGPL-3.0+ # for XOVER, OVER in NNTP, and feeds/homepage/threads in PSGI @@ -9,25 +9,43 @@ use strict; use warnings; use DBI; use DBD::SQLite; -use PublicInbox::SearchMsg; +use PublicInbox::Smsg; use Compress::Zlib qw(uncompress); use constant DEFAULT_LIMIT => 1000; sub dbh_new { - my ($self) = @_; - my $ro = ref($self) eq 'PublicInbox::Over'; - my $f = $self->{filename}; - if (!$ro && !-f $f) { # SQLite defaults mode to 0644, we want 0666 - open my $fh, '+>>', $f or die "failed to open $f: $!"; + my ($self, $rw) = @_; + my $f = delete $self->{filename}; + if (!-f $f) { # SQLite defaults mode to 0644, we want 0666 + if ($rw) { + require PublicInbox::Spawn; + open my $fh, '+>>', $f or die "failed to open $f: $!"; + PublicInbox::Spawn::nodatacow_fd(fileno($fh)); + my $j = "$f-journal"; + open $fh, '+>>', $j or die "failed to open $j: $!"; + PublicInbox::Spawn::nodatacow_fd(fileno($fh)); + } else { + $self->{filename} = $f; # die on stat() below: + } } - my $dbh = DBI->connect("dbi:SQLite:dbname=$f",'','', { - AutoCommit => 1, - RaiseError => 1, - PrintError => 0, - ReadOnly => $ro, - sqlite_use_immediate_transaction => 1, - }); - $dbh->{sqlite_unicode} = 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->do('PRAGMA synchronous = OFF') if ($rw // 0) > 1; $dbh; } @@ -36,20 +54,25 @@ sub new { bless { filename => $f }, $class; } -sub disconnect { $_[0]->{dbh} = undef } +sub disconnect { + my ($self) = @_; + if (my $dbh = delete $self->{dbh}) { + $self->{filename} = $dbh->sqlite_db_filename; + } +} -sub connect { $_[0]->{dbh} ||= $_[0]->dbh_new } +sub connect { $_[0]->{dbh} //= $_[0]->dbh_new } sub load_from_row ($;$) { my ($smsg, $cull) = @_; - bless $smsg, 'PublicInbox::SearchMsg'; + bless $smsg, 'PublicInbox::Smsg'; if (defined(my $data = delete $smsg->{ddd})) { $data = uncompress($data); utf8::decode($data); - PublicInbox::SearchMsg::load_from_data($smsg, $data); + PublicInbox::Smsg::load_from_data($smsg, $data); # saves over 600K for 1000+ message threads - PublicInbox::SearchMsg::psgi_cull($smsg) if $cull; + PublicInbox::Smsg::psgi_cull($smsg) if $cull; } $smsg } @@ -180,11 +203,12 @@ SELECT COUNT(num) FROM over WHERE num > 0 sub get_art { my ($self, $num) = @_; my $dbh = $self->connect; - my $smsg = $dbh->selectrow_hashref(<<'', undef, $num); + my $sth = $dbh->prepare_cached(<<'', undef, 1); SELECT num,ds,ts,ddd FROM over WHERE num = ? LIMIT 1 - return load_from_row($smsg) if $smsg; - undef; + $sth->execute($num); + my $smsg = $sth->fetchrow_hashref; + $smsg ? load_from_row($smsg) : undef; } sub next_by_mid { @@ -216,4 +240,52 @@ SELECT num,ts,ds,ddd FROM over WHERE num = ? LIMIT 1 load_from_row($smsg); } +# IMAP search, this is limited by callers to UID_SLICE size (50K) +sub uid_range { + my ($self, $beg, $end, $sql) = @_; + my $dbh = $self->connect; + my $q = 'SELECT num FROM over WHERE num >= ? AND num <= ?'; + + # This is read-only, anyways; but caller should verify it's + # only sending \A[0-9]+\z for ds and ts column ranges + $q .= $$sql if $sql; + $q .= ' ORDER BY num ASC'; + $dbh->selectcol_arrayref($q, undef, $beg, $end); +} + +sub max { + my ($self) = @_; + my $sth = $self->connect->prepare_cached(<<'', undef, 1); +SELECT MAX(num) FROM over WHERE num > 0 + + $sth->execute; + $sth->fetchrow_array // 0; +} + +sub imap_exists { + my ($self, $uid_base, $uid_end) = @_; + my $sth = $self->connect->prepare_cached(<<'', undef, 1); +SELECT COUNT(num) FROM over WHERE num > ? AND num <= ? + + $sth->execute($uid_base, $uid_end); + $sth->fetchrow_array; +} + +sub check_inodes { + my ($self) = @_; + my $dbh = $self->{dbh} or return; + my $f = $dbh->sqlite_db_filename; + if (my @st = stat($f)) { # did st_dev, st_ino change? + my $st = pack('dd', $st[0], $st[1]); + + # don't actually reopen, just let {dbh} be recreated later + if ($st ne ($self->{st} // $st)) { + delete($self->{dbh}); + $self->{filename} = $f; + } + } else { + warn "W: stat $f: $!\n"; + } +} + 1;