treewide: kill problematic "$h->{k} //= do {" assignments

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

diff --git a/lib/PublicInbox/SharedKV.pm b/lib/PublicInbox/SharedKV.pm
index 8347b1956c8124f9adab6ec200d37a6e21652ed3..4297efedb05742a7cd222c993546768c75cbde8e 100644 (file)
--- a/lib/PublicInbox/SharedKV.pm
+++ b/lib/PublicInbox/SharedKV.pm
@@ -15,7 +15,7 @@ use File::Path qw(rmtree make_path);
 
 sub dbh {
        my ($self, $lock) = @_;
-       $self->{dbh} //= do {
+       $self->{dbh} // do {
                my $f = $self->{filename};
                $lock //= $self->lock_for_scope_fast;
                my $dbh = DBI->connect("dbi:SQLite:dbname=$f", '', '', {
@@ -27,9 +27,6 @@ sub dbh {
                });
                my $opt = $self->{opt} // {};
                $dbh->do('PRAGMA synchronous = OFF') if !$opt->{fsync};
-               if (my $s = $opt->{cache_size}) {
-                       $dbh->do("PRAGMA cache_size = $s");
-               }
                $dbh->do('PRAGMA journal_mode = '.
                                ($opt->{journal_mode} // 'WAL'));
                $dbh->do(<<'');
@@ -39,7 +36,7 @@ CREATE TABLE IF NOT EXISTS kv (
        UNIQUE (k)
 )
 
-               $dbh;
+               $self->{dbh} = $dbh;
        }
 }
 
@@ -51,7 +48,8 @@ sub new {
        $base //= '';
        my $f = $self->{filename} = "$dir/$base.sqlite3";
        $self->{lock_path} = $opt->{lock_path} // "$dir/$base.flock";
-       unless (-f $f) {
+       unless (-s $f) {
+               PublicInbox::Spawn::nodatacow_dir($dir); # for journal/shm/wal
                open my $fh, '+>>', $f or die "failed to open $f: $!";
                PublicInbox::Spawn::nodatacow_fd(fileno($fh));
        }
@@ -84,12 +82,19 @@ SELECT k,v FROM kv
 }
 
 sub keys {
-       my ($self) = @_;
-       my $sth = $self->dbh->prepare_cached(<<'', undef, 1);
-SELECT k FROM kv
-
-       $sth->execute;
-       map { $_->[0] } @{$sth->fetchall_arrayref};
+       my ($self, @pfx) = @_;
+       my $sql = 'SELECT k FROM kv';
+       if (defined $pfx[0]) {
+               $sql .= ' WHERE k LIKE ? ESCAPE ?';
+               my $anywhere = !!$pfx[1];
+               $pfx[1] = '\\';
+               $pfx[0] =~ s/([%_\\])/\\$1/g; # glob chars
+               $pfx[0] .= '%';
+               substr($pfx[0], 0, 0, '%') if $anywhere;
+       } else {
+               @pfx = (); # [0] may've been undef
+       }
+       map { $_->[0] } @{$self->dbh->selectall_arrayref($sql, undef, @pfx)};
 }
 
 sub delete_by_val {
@@ -154,6 +159,13 @@ SELECT COUNT(k) FROM kv
        $sth->fetchrow_array;
 }
 
+# faster than ->count due to how SQLite works
+sub has_entries {
+       my ($self) = @_;
+       my @n = $self->{dbh}->selectrow_array('SELECT k FROM kv LIMIT 1');
+       scalar(@n) ? 1 : undef;
+}
+
 sub dbh_release {
        my ($self, $lock) = @_;
        my $dbh = delete $self->{dbh} or return;