From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 7/7] shared_kv: simplify PID+object guard for cleanup
Date: Fri, 29 Jan 2021 12:43:00 +0500 [thread overview]
Message-ID: <20210129074300.14475-8-e@80x24.org> (raw)
In-Reply-To: <20210129074300.14475-1-e@80x24.org>
We don't need another hash slot when we can encode the object ID
and PID owner into the field name itself.
---
lib/PublicInbox/SharedKV.pm | 8 +++-----
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";
prev parent reply other threads:[~2021-01-29 7:43 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-29 7:42 [PATCH 0/7] lei: more half-baked updates Eric Wong
2021-01-29 7:42 ` [PATCH 1/7] ipc: wq: support passing fields to workers Eric Wong
2021-01-29 7:42 ` [PATCH 2/7] lei_xsearch: drop repeated "Xapian" in error message Eric Wong
2021-01-29 7:42 ` [PATCH 3/7] ipc: more consistent behavior between worker types Eric Wong
2021-01-29 7:42 ` [PATCH 4/7] lei: less error-prone FD mapping Eric Wong
2021-01-29 7:42 ` [PATCH 5/7] git: synchronous cat_file may return type and OID Eric Wong
2021-01-29 7:42 ` [PATCH 6/7] ipc: move on_destroy scope to inside the eval Eric Wong
2021-01-29 7:43 ` Eric Wong [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://public-inbox.org/README
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210129074300.14475-8-e@80x24.org \
--to=e@80x24.org \
--cc=meta@public-inbox.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/public-inbox.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).