}
# the paranoid option
-sub dedupe_oid () {
- my $skv = PublicInbox::SharedKV->new;
- ($skv, sub { # may be called in a child process
+sub dedupe_oid ($) {
+ my ($skv) = @_;
+ (sub { # may be called in a child process
my ($eml, $oid) = @_;
$skv->set_maybe(_oidbin($oid) // _regen_oid($eml), '');
}, sub {
}
# dangerous if there's duplicate messages with different Message-IDs
-sub dedupe_mid () {
- my $skv = PublicInbox::SharedKV->new;
- ($skv, sub { # may be called in a child process
+sub dedupe_mid ($) {
+ my ($skv) = @_;
+ (sub { # may be called in a child process
my ($eml, $oid) = @_;
# TODO: lei will support non-public messages w/o Message-ID
my $mid = $eml->header_raw('Message-ID') // _oidbin($oid) //
}
# our default deduplication strategy (used by v2, also)
-sub dedupe_content () {
- my $skv = PublicInbox::SharedKV->new;
- ($skv, sub { # may be called in a child process
+sub dedupe_content ($) {
+ my ($skv) = @_;
+ (sub { # may be called in a child process
my ($eml) = @_; # oid = $_[1], ignored
$skv->set_maybe(content_hash($eml), '');
}, sub {
# no deduplication at all
sub true { 1 }
-sub dedupe_none () { (undef, \&true, \&true) }
+sub dedupe_none ($) { (\&true, \&true) }
sub new {
my ($cls, $lei, $dst) = @_;
# allow "none" to bypass Eml->new if writing to directory:
return if ($dd eq 'none' && substr($dst // '', -1) eq '/');
+ my $m = "dedupe_$dd";
+ $cls->can($m) or die "unsupported dedupe strategy: $dd\n";
+ my $skv = $dd eq 'none' ? undef : PublicInbox::SharedKV->new;
- my $dd_new = $cls->can("dedupe_$dd") //
- die "unsupported dedupe strategy: $dd\n";
- bless [ $dd_new->() ], $cls; # [ $skv, $cb ]
+ # [ $skv, $eml_cb, $smsg_cb, "dedupe_$dd" ]
+ bless [ $skv, undef, undef, $m ], $cls;
}
# returns true on unseen messages according to the deduplication strategy,
sub prepare_dedupe {
my ($self) = @_;
my $skv = $self->[0];
+ $self->[1] or @$self[1,2] = $self->can($self->[3])->($skv);
$skv ? $skv->dbh : undef;
}
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) = @_;
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 //= '';
$sth->fetchrow_array;
}
+sub DESTROY {
+ my ($self) = @_;
+ rmtree($self->{tmpdir}) if ($self->{tmpid} // '') eq "$$.$self";
+}
+
1;
$smsg->populate($eml);
$smsg->{$_} //= '' for (qw(to cc references)) ;
+my $check_storable = sub {
+ my ($x) = @_;
+ SKIP: {
+ require_mods('Storable', 1);
+ my $dup = Storable::thaw(Storable::freeze($x));
+ is_deeply($dup, $x, "$x->[3] round-trips through storable");
+ }
+};
+
my $lei = { opt => { dedupe => 'none' } };
my $dd = PublicInbox::LeiDedupe->new($lei);
+$check_storable->($dd);
$dd->prepare_dedupe;
ok(!$dd->is_dup($eml), '1st is_dup w/o dedupe');
ok(!$dd->is_dup($eml), '2nd is_dup w/o dedupe');
for my $strat (undef, 'content') {
$lei->{opt}->{dedupe} = $strat;
$dd = PublicInbox::LeiDedupe->new($lei);
+ $check_storable->($dd);
$dd->prepare_dedupe;
my $desc = $strat // 'default';
ok(!$dd->is_dup($eml), "1st is_dup with $desc dedupe");
$lei->{opt}->{dedupe} = 'mid';
$dd = PublicInbox::LeiDedupe->new($lei);
+$check_storable->($dd);
$dd->prepare_dedupe;
ok(!$dd->is_dup($eml), '1st is_dup with mid dedupe');
ok($dd->is_dup($eml), '2nd seen with mid dedupe');
$lei->{opt}->{dedupe} = 'oid';
$dd = PublicInbox::LeiDedupe->new($lei);
+$check_storable->($dd);
$dd->prepare_dedupe;
# --augment won't have OIDs: