dir_idle: treat IN_MOVED_FROM as a gone event

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

diff --git a/lib/PublicInbox/Import.pm b/lib/PublicInbox/Import.pm
index 3adf9dec21785ee9865a22bcdd8e7a338051dcac..60ce7b66419b3ee0e9ad2dca4b93644497539378 100644 (file)
--- a/lib/PublicInbox/Import.pm
+++ b/lib/PublicInbox/Import.pm
@@ -413,19 +413,19 @@ sub add {
                $smsg->{blob} = $self->get_mark(":$blob");
                $smsg->set_bytes($raw_email, $n);
                if (my $oidx = delete $smsg->{-oidx}) { # used by LeiStore
-                       my @docids = $oidx->blob_exists($smsg->{blob});
-                       my @vivify_xvmd;
-                       for my $id (@docids) {
-                               if (my $cur = $oidx->get_art($id)) {
-                                       # already imported if bytes > 0
-                                       return if $cur->{bytes} > 0;
-                                       push @vivify_xvmd, $id;
-                               } else {
-                                       warn "W: $smsg->{blob} ",
-                                               "#$id gone (bug?)\n";
-                               }
-                       }
-                       $smsg->{-vivify_xvmd} = \@vivify_xvmd;
+                       my $eidx_git = delete $smsg->{-eidx_git};
+
+                       # we need this sharedkv to dedupe blobs added in the
+                       # same fast-import transaction
+                       my $u = $self->{uniq_skv} //= do {
+                               require PublicInbox::SharedKV;
+                               my $x = PublicInbox::SharedKV->new;
+                               $x->dbh;
+                               $x;
+                       };
+                       return if !$u->set_maybe($smsg->oidbin, 1);
+                       return if (!$oidx->vivify_xvmd($smsg) &&
+                                       $eidx_git->check($smsg->{blob}));
                }
        }
        my $ref = $self->{ref};
@@ -451,9 +451,6 @@ sub add {
 }
 
 my @INIT_FILES = ('HEAD' => undef, # filled in at runtime
-               'description' => <<EOD,
-Unnamed repository; edit this file 'description' to name the repository.
-EOD
                'config' => <<EOC);
 [core]
        repositoryFormatVersion = 0