X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FMsgmap.pm;h=d28e96c8588b002e62a09b64dc6eaaad51346309;hb=5f6a0d2342323541e44ff2f1e7329053d0263800;hp=ec3d4f9d8101fe0e226895207f2a486016e8a223;hpb=cfb8d16578e7f2f2e300f9f436205e4a8fc7f322;p=public-inbox.git diff --git a/lib/PublicInbox/Msgmap.pm b/lib/PublicInbox/Msgmap.pm index ec3d4f9d..d28e96c8 100644 --- a/lib/PublicInbox/Msgmap.pm +++ b/lib/PublicInbox/Msgmap.pm @@ -1,4 +1,4 @@ -# Copyright (C) 2015-2018 all contributors +# Copyright (C) 2015-2020 all contributors # License: AGPL-3.0+ # bidirectional Message-ID <-> Article Number mapping for the NNTP @@ -9,10 +9,10 @@ # This is maintained by ::SearchIdx package PublicInbox::Msgmap; use strict; -use warnings; use DBI; use DBD::SQLite; -use File::Temp qw(tempfile); +use PublicInbox::Over; +use PublicInbox::Spawn; sub new { my ($class, $git_dir, $writable) = @_; @@ -24,30 +24,19 @@ sub new { new_file($class, "$d/msgmap.sqlite3", $writable); } -sub dbh_new { - my ($f, $writable) = @_; - my $dbh = DBI->connect("dbi:SQLite:dbname=$f",'','', { - AutoCommit => 1, - RaiseError => 1, - PrintError => 0, - ReadOnly => !$writable, - sqlite_use_immediate_transaction => 1, - }); - $dbh->do('PRAGMA case_sensitive_like = ON'); - $dbh; -} - sub new_file { - my ($class, $f, $writable) = @_; - return if !$writable && !-r $f; - - my $dbh = dbh_new($f, $writable); - my $self = bless { dbh => $dbh }, $class; + my ($class, $f, $rw) = @_; + return if !$rw && !-r $f; - if ($writable) { - create_tables($dbh); + my $self = bless { filename => $f }, $class; + my $dbh = $self->{dbh} = PublicInbox::Over::dbh_new($self, $rw); + if ($rw) { $dbh->begin_work; + create_tables($dbh); $self->created_at(time) unless $self->created_at; + + my $max = $self->max // 0; + $self->num_highwater($max); $dbh->commit; } $self; @@ -55,14 +44,15 @@ sub new_file { # used to keep track of used numeric mappings for v2 reindex sub tmp_clone { - my ($self) = @_; - my ($fh, $fn) = tempfile('msgmap-XXXXXXXX', EXLOCK => 0, TMPDIR => 1); + my ($self, $dir) = @_; + require File::Temp; + my $tmp = "mm_tmp-$$-XXXXXX"; + my ($fh, $fn) = File::Temp::tempfile($tmp, EXLOCK => 0, DIR => $dir); + PublicInbox::Spawn::nodatacow_fd(fileno($fh)); $self->{dbh}->sqlite_backup_to_file($fn); - my $tmp = ref($self)->new_file($fn, 1); - $tmp->{dbh}->do('PRAGMA synchronous = OFF'); - $tmp->{tmp_name} = $fn; # SQLite won't work if unlinked, apparently + $tmp = ref($self)->new_file($fn, 2); + $tmp->{dbh}->do('PRAGMA journal_mode = MEMORY'); $tmp->{pid} = $$; - close $fh or die "failed to close $fn: $!"; $tmp; } @@ -105,14 +95,27 @@ sub created_at { $self->meta_accessor('created_at', $second); } +sub num_highwater { + my ($self, $num) = @_; + my $high = $self->{num_highwater} ||= + $self->meta_accessor('num_highwater'); + if (defined($num) && (!defined($high) || ($num > $high))) { + $self->{num_highwater} = $num; + $self->meta_accessor('num_highwater', $num); + } + $self->{num_highwater}; +} + sub mid_insert { my ($self, $mid) = @_; my $dbh = $self->{dbh}; my $sth = $dbh->prepare_cached(<<''); -INSERT OR IGNORE INTO msgmap (mid) VALUES (?) +INSERT INTO msgmap (mid) VALUES (?) - return if $sth->execute($mid) == 0; - $dbh->last_insert_id(undef, undef, 'msgmap', 'num'); + return unless eval { $sth->execute($mid) }; + my $num = $dbh->last_insert_id(undef, undef, 'msgmap', 'num'); + $self->num_highwater($num) if defined($num); + $num; } sub mid_for { @@ -135,34 +138,20 @@ sub num_for { $sth->fetchrow_array; } +sub max { + my $sth = $_[0]->{dbh}->prepare_cached('SELECT MAX(num) FROM msgmap', + undef, 1); + $sth->execute; + $sth->fetchrow_array; +} + sub minmax { - my ($self) = @_; - my $dbh = $self->{dbh}; # breaking MIN and MAX into separate queries speeds up from 250ms # to around 700us with 2.7million messages. - my $sth = $dbh->prepare_cached('SELECT MIN(num) FROM msgmap', undef, 1); + my $sth = $_[0]->{dbh}->prepare_cached('SELECT MIN(num) FROM msgmap', + undef, 1); $sth->execute; - my $min = $sth->fetchrow_array; - $sth = $dbh->prepare_cached('SELECT MAX(num) FROM msgmap', undef, 1); - $sth->execute; - ($min, $sth->fetchrow_array); -} - -sub mid_prefixes { - my ($self, $pfx, $limit) = @_; - - die "No prefix given" unless (defined $pfx && $pfx ne ''); - $pfx =~ s/([%_])/\\$1/g; - $pfx .= '%'; - - $limit ||= 100; - $limit += 0; # force to integer - $limit ||= 100; - - $self->{dbh}->selectcol_arrayref('SELECT mid FROM msgmap ' . - 'WHERE mid LIKE ? ESCAPE ? ' . - "ORDER BY num DESC LIMIT $limit", - undef, $pfx, '\\'); + ($sth->fetchrow_array, max($_[0])); } sub mid_delete { @@ -183,18 +172,20 @@ sub num_delete { sub create_tables { my ($dbh) = @_; - my $e; - - $e = eval { $dbh->selectrow_array('EXPLAIN SELECT * FROM msgmap;') }; - defined $e or $dbh->do('CREATE TABLE msgmap (' . - 'num INTEGER PRIMARY KEY AUTOINCREMENT, '. - 'mid VARCHAR(1000) NOT NULL, ' . - 'UNIQUE (mid) )'); - - $e = eval { $dbh->selectrow_array('EXPLAIN SELECT * FROM meta') }; - defined $e or $dbh->do('CREATE TABLE meta (' . - 'key VARCHAR(32) PRIMARY KEY, '. - 'val VARCHAR(255) NOT NULL)'); + + $dbh->do(<<''); +CREATE TABLE IF NOT EXISTS msgmap ( + num INTEGER PRIMARY KEY AUTOINCREMENT, + mid VARCHAR(1000) NOT NULL, + UNIQUE (mid) +) + + $dbh->do(<<''); +CREATE TABLE IF NOT EXISTS meta ( + key VARCHAR(32) PRIMARY KEY, + val VARCHAR(255) NOT NULL +) + } # used by NNTP.pm @@ -209,12 +200,13 @@ ORDER BY num ASC LIMIT 1000 } sub msg_range { - my ($self, $beg, $end) = @_; + my ($self, $beg, $end, $cols) = @_; + $cols //= 'num,mid'; my $dbh = $self->{dbh}; my $attr = { Columns => [] }; - my $mids = $dbh->selectall_arrayref(<<'', $attr, $$beg, $end); -SELECT num,mid FROM msgmap WHERE num >= ? AND num <= ? -ORDER BY num ASC + my $mids = $dbh->selectall_arrayref(<<"", $attr, $$beg, $end); +SELECT $cols FROM msgmap WHERE num >= ? AND num <= ? +ORDER BY num ASC LIMIT 1000 $$beg = $mids->[-1]->[0] + 1 if @$mids; $mids @@ -228,34 +220,82 @@ sub mid_set { $self->{dbh}->prepare( 'INSERT OR IGNORE INTO msgmap (num,mid) VALUES (?,?)'); }; - $sth->execute($num, $mid); + my $result = $sth->execute($num, $mid); + $self->num_highwater($num) if (defined($result) && $result == 1); + $result; } sub DESTROY { my ($self) = @_; - delete $self->{dbh}; - my $f = delete $self->{tmp_name}; - if (defined $f && $self->{pid} == $$) { + my $dbh = $self->{dbh} or return; + if (($self->{pid} // 0) == $$) { + my $f = $dbh->sqlite_db_filename; unlink $f or warn "failed to unlink $f: $!\n"; } } sub atfork_parent { my ($self) = @_; - my $f = $self->{tmp_name} or die "not a temporary clone\n"; - delete $self->{dbh} and die "tmp_clone dbh not prepared for parent"; - my $dbh = $self->{dbh} = dbh_new($f, 1); - $dbh->do('PRAGMA synchronous = OFF'); + $self->{pid} or die 'BUG: not a temporary clone'; + $self->{dbh} and die 'BUG: tmp_clone dbh not prepared for parent'; + defined($self->{filename}) or die 'BUG: {filename} not defined'; + $self->{dbh} = PublicInbox::Over::dbh_new($self, 2); + $self->{dbh}->do('PRAGMA journal_mode = MEMORY'); } sub atfork_prepare { my ($self) = @_; - my $f = $self->{tmp_name} or die "not a temporary clone\n"; - $self->{pid} == $$ or - die "BUG: atfork_prepare not called from $self->{pid}\n"; - $self->{dbh} or die "temporary clone not open\n"; + my $pid = $self->{pid} or die 'BUG: not a temporary clone'; + $pid == $$ or die "BUG: atfork_prepare not called by $pid"; + my $dbh = $self->{dbh} or die 'BUG: temporary clone not open'; + # must clobber prepared statements - %$self = (tmp_name => $f, pid => $$); + %$self = (filename => $dbh->sqlite_db_filename, pid => $pid); +} + +sub skip_artnum { + my ($self, $skip_artnum) = @_; + return meta_accessor($self, 'skip_artnum') if !defined($skip_artnum); + + my $cur = num_highwater($self) // 0; + if ($skip_artnum < $cur) { + die "E: current article number $cur ", + "exceeds --skip-artnum=$skip_artnum\n"; + } else { + my $ok; + for (1..10) { + my $mid = 'skip'.rand.'@'.rand.'.example.com'; + $ok = mid_set($self, $skip_artnum, $mid); + if ($ok) { + mid_delete($self, $mid); + last; + } + } + $ok or die '--skip-artnum failed'; + + # in the future, the indexer may use this value for + # new messages in old epochs + meta_accessor($self, 'skip_artnum', $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"; + } } 1;