sharedkv: use lock_for_scope_fast

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

diff --git a/lib/PublicInbox/SharedKV.pm b/lib/PublicInbox/SharedKV.pm
index 94f2429fdda2eaf51b3c378b5bd4c383bec43b8b..b0588060435aae9525c6480b029d12f49b059988 100644 (file)
--- a/lib/PublicInbox/SharedKV.pm
+++ b/lib/PublicInbox/SharedKV.pm
@@ -17,7 +17,7 @@ sub dbh {
        my ($self, $lock) = @_;
        $self->{dbh} //= do {
                my $f = $self->{filename};
-               $lock //= $self->lock_for_scope;
+               $lock //= $self->lock_for_scope_fast;
                my $dbh = DBI->connect("dbi:SQLite:dbname=$f", '', '', {
                        AutoCommit => 1,
                        RaiseError => 1,
@@ -58,13 +58,13 @@ sub new {
 
 sub index_values {
        my ($self) = @_;
-       my $lock = $self->lock_for_scope;
+       my $lock = $self->lock_for_scope_fast;
        $self->dbh($lock)->do('CREATE INDEX IF NOT EXISTS idx_v ON kv (v)');
 }
 
 sub set_maybe {
        my ($self, $key, $val, $lock) = @_;
-       $lock //= $self->lock_for_scope;
+       $lock //= $self->lock_for_scope_fast;
        my $e = $self->{dbh}->prepare_cached(<<'')->execute($key, $val);
 INSERT OR IGNORE INTO kv (k,v) VALUES (?, ?)
 
@@ -83,7 +83,7 @@ SELECT k,v FROM kv
 
 sub delete_by_val {
        my ($self, $val, $lock) = @_;
-       $lock //= $self->lock_for_scope;
+       $lock //= $self->lock_for_scope_fast;
        $self->{dbh}->prepare_cached(<<'')->execute($val) + 0;
 DELETE FROM kv WHERE v = ?
 
@@ -91,7 +91,7 @@ DELETE FROM kv WHERE v = ?
 
 sub replace_values {
        my ($self, $oldval, $newval, $lock) = @_;
-       $lock //= $self->lock_for_scope;
+       $lock //= $self->lock_for_scope_fast;
        $self->{dbh}->prepare_cached(<<'')->execute($newval, $oldval) + 0;
 UPDATE kv SET v = ? WHERE v = ?
 
@@ -122,7 +122,7 @@ SELECT v FROM kv WHERE k = ?
 
 sub xchg {
        my ($self, $key, $newval, $lock) = @_;
-       $lock //= $self->lock_for_scope;
+       $lock //= $self->lock_for_scope_fast;
        my $oldval = get($self, $key);
        if (defined $newval) {
                set($self, $key, $newval);
@@ -143,10 +143,25 @@ SELECT COUNT(k) FROM kv
        $sth->fetchrow_array;
 }
 
+sub dbh_release {
+       my ($self, $lock) = @_;
+       my $dbh = delete $self->{dbh} or return;
+       $lock //= $self->lock_for_scope_fast; # may be needed for WAL
+       %{$dbh->{CachedKids}} = (); # cleanup prepare_cached
+       $dbh->disconnect;
+}
+
 sub DESTROY {
        my ($self) = @_;
+       dbh_release($self);
        my $dir = delete $self->{"tmp$$.$self"} or return;
-       rmtree($dir);
+       my $tries = 0;
+       do {
+               $! = 0;
+               eval { rmtree($dir) };
+       } while ($@ && $!{ENOENT} && $tries++ < 5);
+       warn "error removing $dir: $@" if $@;
+       warn "Took $tries tries to remove $dir\n" if $tries;
 }
 
 1;