v2writable: warn on unseen deleted files

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

diff --git a/lib/PublicInbox/V2Writable.pm b/lib/PublicInbox/V2Writable.pm
index 20c27363c3bb55290ef8a1b6c98144f0621e4f4d..01ec98ac58c332655b0f31d38a1c551f784b21ae 100644 (file)
--- a/lib/PublicInbox/V2Writable.pm
+++ b/lib/PublicInbox/V2Writable.pm
@@ -173,8 +173,7 @@ sub num_for_harder {
                        $num = $self->{skel}->{mm}->mid_insert($$mid0);
                }
        }
-       my @cur = $hdr->header_raw('Message-Id');
-       $hdr->header_set('Message-Id', "<$$mid0>", @cur);
+       PublicInbox::Import::prepend_mid($hdr, $$mid0);
        $num;
 }
 
@@ -496,7 +495,7 @@ sub mark_deleted {
        my $mids = mids($mime->header_obj);
        my $cid = content_id($mime);
        foreach my $mid (@$mids) {
-               $D->{$mid.$cid} = 1;
+               $D->{"$mid\0$cid"} = 1;
        }
 }
 
@@ -514,7 +513,7 @@ sub reindex_oid {
        my $num = -1;
        my $del = 0;
        foreach my $mid (@$mids) {
-               $del += (delete $D->{$mid.$cid} || 0);
+               $del += (delete $D->{"$mid\0$cid"} || 0);
                my $n = $mm_tmp->num_for($mid);
                if (defined $n && $n > $num) {
                        $mid0 = $mid;
@@ -634,6 +633,14 @@ sub reindex {
        }
        my ($min, $max) = $mm_tmp->minmax;
        defined $max and die "leftover article numbers at $min..$max\n";
+       my @d = sort keys %$D;
+       if (@d) {
+               warn "BUG: ", scalar(@d)," unseen deleted messages marked\n";
+               foreach (@d) {
+                       my ($mid, undef) = split(/\0/, $_, 2);
+                       warn "<$mid>\n";
+               }
+       }
 }
 
 1;