}
$nparts = nproc() if ($nparts == 0);
+ $v2ibx = PublicInbox::InboxWritable->new($v2ibx);
my $self = {
-inbox => $v2ibx,
im => undef, # PublicInbox::Import
warn "<$mid> reused for mismatched content\n";
# try the rest of the mids
- foreach my $i (1..$#$mids) {
+ for(my $i = $#$mids; $i >= 1; $i--) {
my $m = $mids->[$i];
$num = $self->{skel}->{mm}->mid_insert($m);
if (defined $num) {
# frequently activated.
delete $ibx->{$_} foreach (qw(git mm search));
- $self->lock_acquire;
+ $ibx->umask_prepare;
+ $ibx->with_umask(sub {
+ $self->lock_acquire;
- # first time initialization, first we create the skeleton pipe:
- my $skel = $self->{skel} = PublicInbox::SearchIdxSkeleton->new($self);
+ # first time initialization, first we create the skeleton pipe:
+ my $skel = PublicInbox::SearchIdxSkeleton->new($self);
+ $self->{skel} = $skel;
- # need to create all parts before initializing msgmap FD
- my $max = $self->{partitions} - 1;
- my $idx = $self->{idx_parts} = [];
- for my $i (0..$max) {
- push @$idx, PublicInbox::SearchIdxPart->new($self, $i, $skel);
- }
+ # need to create all parts before initializing msgmap FD
+ my $max = $self->{partitions} - 1;
+ @{$self->{idx_parts}} = map {
+ PublicInbox::SearchIdxPart->new($self, $_, $skel);
+ } (0..$max);
- # Now that all subprocesses are up, we can open the FD for SQLite:
- $skel->_msgmap_init->{dbh}->begin_work;
+ # Now that all subprocesses are up, we can open the FD for SQLite:
+ $skel->_msgmap_init->{dbh}->begin_work;
+ });
}
sub purge_oids {
$num = $$regen--;
die "BUG: ran out of article numbers\n" if $num <= 0;
my $mm = $self->{skel}->{mm};
- foreach my $mid (@$mids) {
+ foreach my $mid (reverse @$mids) {
if ($mm->mid_set($num, $mid) == 1) {
$mid0 = $mid;
last;
}
if (!defined($mid0)) {
my $id = '<' . join('> <', @$mids) . '>';
- warn "Message-Id $id unusable for $num\n";
+ warn "Message-ID $id unusable for $num\n";
+ foreach my $mid (@$mids) {
+ defined(my $n = $mm->num_for($mid)) or next;
+ warn "#$n previously mapped for <$mid>\n";
+ }
}
}
}
delete $self->{reindex_pipe};
}
+ my $gaps;
+ if ($regen && $$regen != 0) {
+ warn "W: leftover article number ($$regen)\n";
+ $gaps = 1;
+ }
my ($min, $max) = $mm_tmp->minmax;
- defined $max and die "leftover article numbers at $min..$max\n";
+ if (defined $max) {
+ warn "W: leftover article numbers at $min..$max\n";
+ $gaps = 1;
+ }
+ warn "W: were old git partitions deleted?\n" if $gaps;
my @d = sort keys %$D;
if (@d) {
warn "BUG: ", scalar(@d)," unseen deleted messages marked\n";