diff options
| author | Eric Wong <e@80x24.org> | 2021-01-29 12:43:00 +0500 |
|---|---|---|
| committer | Eric Wong <e@80x24.org> | 2021-01-30 01:08:21 +0000 |
| commit | 12a067a41430f579f5a3cea4e2d027242e604f72 (patch) | |
| tree | 594b35e3bf33766c5ff3eaa771f2985afa107ba7 | |
| parent | c0365a9fae1a72707fb78249861c80fed582d89b (diff) | |
| download | public-inbox-12a067a41430f579f5a3cea4e2d027242e604f72.tar.gz | |
We don't need another hash slot when we can encode the object ID and PID owner into the field name itself.
| -rw-r--r-- | lib/PublicInbox/SharedKV.pm | 8 | ||||
| -rw-r--r-- | t/shared_kv.t | 2 |
2 files changed, 4 insertions, 6 deletions
diff --git a/lib/PublicInbox/SharedKV.pm b/lib/PublicInbox/SharedKV.pm index 072c94ca..94f2429f 100644 --- a/lib/PublicInbox/SharedKV.pm +++ b/lib/PublicInbox/SharedKV.pm @@ -44,10 +44,7 @@ CREATE TABLE IF NOT EXISTS kv ( sub new { my ($cls, $dir, $base, $opt) = @_; my $self = bless { opt => $opt }, $cls; - unless (defined $dir) { - $self->{tmpdir} = $dir = tempdir('skv-XXXXXX', TMPDIR => 1); - $self->{tmpid} = "$$.$self"; - } + $dir //= $self->{"tmp$$.$self"} = tempdir("skv.$$-XXXX", TMPDIR => 1); -d $dir or mkdir($dir) or die "mkdir($dir): $!"; $base //= ''; my $f = $self->{filename} = "$dir/$base.sqlite3"; @@ -148,7 +145,8 @@ SELECT COUNT(k) FROM kv sub DESTROY { my ($self) = @_; - rmtree($self->{tmpdir}) if ($self->{tmpid} // '') eq "$$.$self"; + my $dir = delete $self->{"tmp$$.$self"} or return; + rmtree($dir); } 1; diff --git a/t/shared_kv.t b/t/shared_kv.t index 6f6374f2..fcae688a 100644 --- a/t/shared_kv.t +++ b/t/shared_kv.t @@ -9,7 +9,7 @@ use_ok 'PublicInbox::SharedKV'; my ($tmpdir, $for_destroy) = tmpdir(); local $ENV{TMPDIR} = $tmpdir; my $skv = PublicInbox::SharedKV->new; -my $skv_tmpdir = $skv->{tmpdir}; +my $skv_tmpdir = $skv->{"tmp$$.$skv"}; ok(-d $skv_tmpdir, 'created a temporary dir'); $skv->dbh; my $dead = "\xde\xad"; |