}
$nparts = nproc() if ($nparts == 0);
+ $v2ibx = PublicInbox::InboxWritable->new($v2ibx);
my $self = {
-inbox => $v2ibx,
im => undef, # PublicInbox::Import
# 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 {
-d $git->{git_dir} or next; # missing parts are fine
chomp($tip = $git->qx('rev-parse', $head)) unless $tip;
my $h = $cur == $max_git ? $tip : $head;
- my @count = ('rev-list', '--count', $h, '--', 'm');
- $regen_max += $git->qx(@count);
+
+ # can't use 'rev-list --count' if we use --diff-filter
+ my $fh = $git->popen(qw(log --pretty=tformat:%h
+ --no-notes --no-color --no-renames
+ --diff-filter=AM), $h, '--', 'm');
+ ++$regen_max while <$fh>;
}
die "No messages found in $pfx/*.git, bug?\n" unless $regen_max;
$regen = \$regen_max;
}
my $D = {};
my @cmd = qw(log --raw -r --pretty=tformat:%h
- --no-notes --no-color --no-abbrev);
+ --no-notes --no-color --no-abbrev --no-renames);
# if we are regenerating, we must not use a newer tip commit than what
# the regeneration counter used:
} elsif (/\A:\d{6} 100644 $x40 ($x40) [AM]\tm$/o) {
$self->reindex_oid($mm_tmp, $D, $git, $1,
$regen);
- } elsif (m!\A:\d{6} 100644 $x40 ($x40) [AM]\t_/D$!o) {
+ } elsif (/\A:\d{6} 100644 $x40 ($x40) [AM]\td$/o) {
$self->mark_deleted($D, $git, $1);
}
}