treewide: run update-copyrights from gnulib for 2019

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

diff --git a/lib/PublicInbox/Msgmap.pm b/lib/PublicInbox/Msgmap.pm
index 3237a5ed6ae0d8caa5a56bd1a17e380efc61a0b8..9523752e9af07f8b973ac45d5a5aeda408801513 100644 (file)
--- a/lib/PublicInbox/Msgmap.pm
+++ b/lib/PublicInbox/Msgmap.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2015-2018 all contributors <meta@public-inbox.org>
+# Copyright (C) 2015-2020 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
@@ -26,6 +26,9 @@ sub new {
 
 sub dbh_new {
        my ($f, $writable) = @_;
+       if ($writable && !-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,
@@ -33,7 +36,6 @@ sub dbh_new {
                ReadOnly => !$writable,
                sqlite_use_immediate_transaction => 1,
        });
-       $dbh->do('PRAGMA case_sensitive_like = ON');
        $dbh;
 }
 
@@ -48,6 +50,10 @@ sub new_file {
                create_tables($dbh);
                $dbh->begin_work;
                $self->created_at(time) unless $self->created_at;
+
+               my (undef, $max) = $self->minmax();
+               $max ||= 0;
+               $self->num_highwater($max);
                $dbh->commit;
        }
        $self;
@@ -78,7 +84,7 @@ sub meta_accessor {
        $prev = $dbh->selectrow_array($sql, undef, $key);
 
        if (defined $prev) {
-               $sql = 'UPDATE meta SET val = ? WHERE key = ? LIMIT 1';
+               $sql = 'UPDATE meta SET val = ? WHERE key = ?';
                $dbh->do($sql, undef, $value, $key);
        } else {
                $sql = 'INSERT INTO meta (key,val) VALUES (?,?)';
@@ -105,14 +111,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 {
@@ -148,23 +167,6 @@ sub minmax {
        ($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, '\\');
-}
-
 sub mid_delete {
        my ($self, $mid) = @_;
        my $dbh = $self->{dbh};
@@ -209,12 +211,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,7 +231,9 @@ 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 {