lei_dedupe+shared_kv: ensure round-tripping serialization

We'll be passing these objects via PublicInbox::IPC which uses
Storable (or Sereal), so ensure they're safe to use after
serialization.

1 files changed, 9 insertions, 3 deletions

diff --git a/lib/PublicInbox/SharedKV.pm b/lib/PublicInbox/SharedKV.pm
index d75d8998..072c94ca 100644
--- a/lib/PublicInbox/SharedKV.pm
+++ b/lib/PublicInbox/SharedKV.pm
@@ -8,9 +8,10 @@ package PublicInbox::SharedKV;
 use strict;
 use v5.10.1;
 use parent qw(PublicInbox::Lock);
-use File::Temp 0.19 (); # 0.19 for ->newdir
+use File::Temp qw(tempdir);
 use DBI ();
 use PublicInbox::Spawn;
+use File::Path qw(rmtree);
 
 sub dbh {
         my ($self, $lock) = @_;
@@ -44,8 +45,8 @@ sub new {
         my ($cls, $dir, $base, $opt) = @_;
         my $self = bless { opt => $opt }, $cls;
         unless (defined $dir) {
-                $self->{tmp} = File::Temp->newdir('kv-XXXXXX', TMPDIR => 1);
-                $dir = $self->{tmp}->dirname;
+                $self->{tmpdir} = $dir = tempdir('skv-XXXXXX', TMPDIR => 1);
+                $self->{tmpid} = "$$.$self";
         }
         -d $dir or mkdir($dir) or die "mkdir($dir): $!";
         $base //= '';
@@ -145,4 +146,9 @@ SELECT COUNT(k) FROM kv
         $sth->fetchrow_array;
 }
 
+sub DESTROY {
+        my ($self) = @_;
+        rmtree($self->{tmpdir}) if ($self->{tmpid} // '') eq "$$.$self";
+}
+
 1;