diff options
Diffstat (limited to 'lib/PublicInbox/Msgmap.pm')
| -rw-r--r-- | lib/PublicInbox/Msgmap.pm | 127 |
1 files changed, 55 insertions, 72 deletions
diff --git a/lib/PublicInbox/Msgmap.pm b/lib/PublicInbox/Msgmap.pm index 3887a9e6..cb4bb295 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'); @@ -61,18 +66,15 @@ sub meta_accessor { my ($self, $key, $value) = @_; my $sql = 'SELECT val FROM meta WHERE key = ? LIMIT 1'; - my $dbh = $self->{dbh}; - my $prev; - defined $value or return $dbh->selectrow_array($sql, undef, $key); - - $prev = $dbh->selectrow_array($sql, undef, $key); + my $prev = $self->{dbh}->selectrow_array($sql, undef, $key); + $value // return $prev; if (defined $prev) { $sql = 'UPDATE meta SET val = ? WHERE key = ?'; - $dbh->do($sql, undef, $value, $key); + $self->{dbh}->do($sql, undef, $value, $key); } else { $sql = 'INSERT INTO meta (key,val) VALUES (?,?)'; - $dbh->do($sql, undef, $key, $value); + $self->{dbh}->do($sql, undef, $key, $value); } $prev; } @@ -98,44 +100,40 @@ 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 { my ($self, $mid) = @_; - my $dbh = $self->{dbh}; - my $sth = $dbh->prepare_cached(<<''); + my $sth = $self->{dbh}->prepare_cached(<<''); INSERT INTO msgmap (mid) VALUES (?) return unless eval { $sth->execute($mid) }; - my $num = $dbh->last_insert_id(undef, undef, 'msgmap', 'num'); + my $num = $self->{dbh}->last_insert_id(undef, undef, 'msgmap', 'num'); $self->num_highwater($num) if defined($num); $num; } sub mid_for { my ($self, $num) = @_; - my $dbh = $self->{dbh}; - my $sth = $self->{mid_for} ||= - $dbh->prepare('SELECT mid FROM msgmap WHERE num = ? LIMIT 1'); - $sth->bind_param(1, $num); - $sth->execute; + my $sth = $self->{dbh}->prepare_cached(<<"", undef, 1); +SELECT mid FROM msgmap WHERE num = ? LIMIT 1 + + $sth->execute($num); $sth->fetchrow_array; } sub num_for { my ($self, $mid) = @_; - my $dbh = $self->{dbh}; - my $sth = $self->{num_for} ||= - $dbh->prepare('SELECT num FROM msgmap WHERE mid = ? LIMIT 1'); - $sth->bind_param(1, $mid); - $sth->execute; + my $sth = $self->{dbh}->prepare_cached(<<"", undef, 1); +SELECT num FROM msgmap WHERE mid = ? LIMIT 1 + + $sth->execute($mid); $sth->fetchrow_array; } @@ -146,29 +144,27 @@ 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 { my ($self, $mid) = @_; - my $dbh = $self->{dbh}; - my $sth = $dbh->prepare('DELETE FROM msgmap WHERE mid = ?'); - $sth->bind_param(1, $mid); - $sth->execute; + $self->{dbh}->do('DELETE FROM msgmap WHERE mid = ?', undef, $mid); } sub num_delete { my ($self, $num) = @_; - my $dbh = $self->{dbh}; - my $sth = $dbh->prepare('DELETE FROM msgmap WHERE num = ?'); - $sth->bind_param(1, $num); - $sth->execute; + $self->{dbh}->do('DELETE FROM msgmap WHERE num = ?', undef, $num); } sub create_tables { @@ -192,9 +188,8 @@ CREATE TABLE IF NOT EXISTS meta ( sub msg_range { my ($self, $beg, $end, $cols) = @_; $cols //= 'num,mid'; - my $dbh = $self->{dbh}; my $attr = { Columns => [] }; - my $mids = $dbh->selectall_arrayref(<<"", $attr, $$beg, $end); + my $mids = $self->{dbh}->selectall_arrayref(<<"", $attr, $$beg, $end); SELECT $cols FROM msgmap WHERE num >= ? AND num <= ? ORDER BY num ASC LIMIT 1000 @@ -206,10 +201,9 @@ ORDER BY num ASC LIMIT 1000 # see scripts/xhdr-num2mid or PublicInbox::Filter::RubyLang for usage sub mid_set { my ($self, $num, $mid) = @_; - my $sth = $self->{mid_set} ||= do { - $self->{dbh}->prepare( - 'INSERT OR IGNORE INTO msgmap (num,mid) VALUES (?,?)'); - }; + my $sth = $self->{dbh}->prepare_cached(<<""); +INSERT OR IGNORE INTO msgmap (num,mid) VALUES (?,?) + my $result = $sth->execute($num, $mid); $self->num_highwater($num) if (defined($result) && $result == 1); $result; @@ -271,21 +265,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; |