extmsg: use Xapian only for partial matches

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

diff --git a/lib/PublicInbox/Msgmap.pm b/lib/PublicInbox/Msgmap.pm
index f5f88431bbfa82d1e7af847126d14441f6409864..192e311aec2b1d459407e0853cfcecb26c2f0448 100644 (file)
--- a/lib/PublicInbox/Msgmap.pm
+++ b/lib/PublicInbox/Msgmap.pm
@@ -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;
 }
 
@@ -78,7 +80,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 (?,?)';
@@ -108,10 +110,10 @@ sub created_at {
 sub mid_insert {
        my ($self, $mid) = @_;
        my $dbh = $self->{dbh};
-       my $sql = 'INSERT OR IGNORE INTO msgmap (mid) VALUES (?)';
-       my $sth = $self->{mid_insert} ||= $dbh->prepare($sql);
-       $sth->bind_param(1, $mid);
-       return if $sth->execute == 0;
+       my $sth = $dbh->prepare_cached(<<'');
+INSERT OR IGNORE INTO msgmap (mid) VALUES (?)
+
+       return if $sth->execute($mid) == 0;
        $dbh->last_insert_id(undef, undef, 'msgmap', 'num');
 }
 
@@ -138,27 +140,14 @@ sub num_for {
 sub minmax {
        my ($self) = @_;
        my $dbh = $self->{dbh};
-       my $sth = $self->{num_minmax} ||=
-               $dbh->prepare('SELECT MIN(num),MAX(num) FROM msgmap');
+       # 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);
        $sth->execute;
-        $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, '\\');
+       my $min = $sth->fetchrow_array;
+       $sth = $dbh->prepare_cached('SELECT MAX(num) FROM msgmap', undef, 1);
+       $sth->execute;
+       ($min, $sth->fetchrow_array);
 }
 
 sub mid_delete {