-# Copyright (C) 2018-2019 all contributors <meta@public-inbox.org>
+# Copyright (C) 2018-2020 all contributors <meta@public-inbox.org>
# License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
# This interface wraps and mimics PublicInbox::Import
use strict;
use warnings;
use base qw(PublicInbox::Lock);
+use 5.010_001;
use PublicInbox::SearchIdxShard;
-use PublicInbox::MIME;
+use PublicInbox::Eml;
use PublicInbox::Git;
use PublicInbox::Import;
use PublicInbox::MID qw(mids references);
-use PublicInbox::ContentId qw(content_id content_digest);
+use PublicInbox::ContentHash qw(content_hash content_digest);
use PublicInbox::Inbox;
use PublicInbox::OverIdx;
use PublicInbox::Msgmap;
-use PublicInbox::Spawn qw(spawn);
+use PublicInbox::Spawn qw(spawn popen_rd);
use PublicInbox::SearchIdx;
-use IO::Handle;
+use PublicInbox::MultiMidQueue;
+use IO::Handle; # ->autoflush
use File::Temp qw(tempfile);
# an estimate of the post-packed size to the raw uncompressed size
# to increase Xapian shards
our $NPROC_MAX_DEFAULT = 4;
-sub nproc_shards ($) {
- my ($creat_opt) = @_;
- if (ref($creat_opt) eq 'HASH') {
- if (defined(my $n = $creat_opt->{nproc})) {
- return $n
- }
+sub detect_nproc () {
+ for my $nproc (qw(nproc gnproc)) { # GNU coreutils nproc
+ `$nproc 2>/dev/null` =~ /^(\d+)$/ and return $1;
}
- my $n = $ENV{NPROC};
+ # getconf(1) is POSIX, but *NPROCESSORS* vars are not
+ for (qw(_NPROCESSORS_ONLN NPROCESSORS_ONLN)) {
+ `getconf $_ 2>/dev/null` =~ /^(\d+)$/ and return $1;
+ }
+
+ # should we bother with `sysctl hw.ncpu`? Those only give
+ # us total processor count, not online processor count.
+ undef
+}
+
+sub nproc_shards ($) {
+ my ($creat_opt) = @_;
+ my $n = $creat_opt->{nproc} if ref($creat_opt) eq 'HASH';
+ $n //= $ENV{NPROC};
if (!$n) {
- chomp($n = `nproc 2>/dev/null`);
- # assume 2 cores if GNU nproc(1) is not available
- $n = 2 if !$n;
+ # assume 2 cores if not detectable or zero
+ state $NPROC_DETECTED = detect_nproc() || 2;
+ $n = $NPROC_DETECTED;
$n = $NPROC_MAX_DEFAULT if $n > $NPROC_MAX_DEFAULT;
}
# Also, shard count may change while -watch is running
# due to "xcpdb --reshard"
if (-d $xpfx) {
+ my $XapianDatabase;
foreach my $shard (<$xpfx/*>) {
-d $shard && $shard =~ m!/[0-9]+\z! or next;
+ $XapianDatabase //= do {
+ require PublicInbox::Search;
+ PublicInbox::Search::load_xapian();
+ $PublicInbox::Search::X{Database};
+ };
eval {
- Search::Xapian::Database->new($shard)->close;
+ $XapianDatabase->new($shard)->close;
$n++;
};
}
im => undef, # PublicInbox::Import
parallel => 1,
transact_bytes => 0,
+ total_bytes => 0,
current_info => '',
xpfx => $xpfx,
over => PublicInbox::OverIdx->new("$xpfx/over.sqlite3", 1),
last_commit => [], # git repo -> commit
};
$self->{shards} = count_shards($self) || nproc_shards($creat);
+ $self->{index_max_size} = $v2ibx->{index_max_size};
bless $self, $class;
}
# public (for now?)
sub init_inbox {
- my ($self, $parallel, $skip_epoch) = @_;
- $self->{parallel} = $parallel;
+ my ($self, $shards, $skip_epoch, $skip_artnum) = @_;
+ if (defined $shards) {
+ $self->{parallel} = 0 if $shards == 0;
+ $self->{shards} = $shards if $shards > 0;
+ }
$self->idx_init;
+ $self->{mm}->skip_artnum($skip_artnum) if defined $skip_artnum;
my $epoch_max = -1;
git_dir_latest($self, \$epoch_max);
if (defined $skip_epoch && $epoch_max == -1) {
}
# indexes a message, returns true if checkpointing is needed
-sub do_idx ($$$$$$$) {
- my ($self, $msgref, $mime, $len, $num, $oid, $mid0) = @_;
- $self->{over}->add_overview($mime, $len, $num, $oid, $mid0);
- my $idx = idx_shard($self, $num % $self->{shards});
- $idx->index_raw($len, $msgref, $num, $oid, $mid0, $mime);
- my $n = $self->{transact_bytes} += $len;
- $n >= (PublicInbox::SearchIdx::BATCH_BYTES * $self->{shards});
+sub do_idx ($$$$) {
+ my ($self, $msgref, $mime, $smsg) = @_;
+ $smsg->{bytes} = $smsg->{raw_bytes} +
+ PublicInbox::SearchIdx::crlf_adjust($$msgref);
+ $self->{over}->add_overview($mime, $smsg);
+ my $idx = idx_shard($self, $smsg->{num} % $self->{shards});
+ $idx->index_raw($msgref, $mime, $smsg);
+ my $n = $self->{transact_bytes} += $smsg->{raw_bytes};
+ $n >= ($PublicInbox::SearchIdx::BATCH_BYTES * $self->{shards});
}
sub _add {
# spam check:
if ($check_cb) {
- $mime = $check_cb->($mime) or return;
+ $mime = $check_cb->($mime, $self->{-inbox}) or return;
}
# All pipes (> $^F) known to Perl 5.6+ have FD_CLOEXEC set,
my ($num, $mid0) = v2_num_for($self, $mime);
defined $num or return; # duplicate
- defined $mid0 or die "BUG: $mid0 undefined\n";
+ defined $mid0 or die "BUG: \$mid0 undefined\n";
my $im = $self->importer;
- my $cmt = $im->add($mime);
+ my $smsg = bless { mid => $mid0, num => $num }, 'PublicInbox::Smsg';
+ my $cmt = $im->add($mime, undef, $smsg); # sets $smsg->{ds|ts|blob}
$cmt = $im->get_mark($cmt);
$self->{last_commit}->[$self->{epoch_max}] = $cmt;
- my ($oid, $len, $msgref) = @{$im->{last_object}};
- if (do_idx($self, $msgref, $mime, $len, $num, $oid, $mid0)) {
+ my $msgref = delete $smsg->{-raw_email};
+ if (do_idx($self, $msgref, $mime, $smsg)) {
$self->checkpoint;
}
# crap, Message-ID is already known, hope somebody just resent:
foreach my $m (@$mids) {
# read-only lookup now safe to do after above barrier
- my $existing = lookup_content($self, $mime, $m);
# easy, don't store duplicates
# note: do not add more diagnostic info here since
# it gets noisy on public-inbox-watch restarts
- return () if $existing;
+ return () if content_exists($self, $mime, $m);
}
# AltId may pre-populate article numbers (e.g. X-Mail-Count
$rewrites;
}
-sub content_ids ($) {
+sub content_hashes ($) {
my ($mime) = @_;
- my @cids = ( content_id($mime) );
+ my @chashes = ( content_hash($mime) );
+ # We still support Email::MIME, here, and
# Email::MIME->as_string doesn't always round-trip, so we may
- # use a second content_id
- my $rt = content_id(PublicInbox::MIME->new(\($mime->as_string)));
- push @cids, $rt if $cids[0] ne $rt;
- \@cids;
+ # use a second content_hash
+ my $rt = content_hash(PublicInbox::Eml->new(\($mime->as_string)));
+ push @chashes, $rt if $chashes[0] ne $rt;
+ \@chashes;
}
sub content_matches ($$) {
- my ($cids, $existing) = @_;
- my $cid = content_id($existing);
- foreach (@$cids) {
- return 1 if $_ eq $cid
+ my ($chashes, $existing) = @_;
+ my $chash = content_hash($existing);
+ foreach (@$chashes) {
+ return 1 if $_ eq $chash
}
0
}
$im = $self->importer;
}
my $over = $self->{over};
- my $cids = content_ids($old_mime);
- my $removed;
+ my $chashes = content_hashes($old_mime);
+ my @removed;
my $mids = mids($old_mime->header_obj);
# We avoid introducing new blobs into git since the raw content
# can be slightly different, so we do not need the user-supplied
- # message now that we have the mids and content_id
+ # message now that we have the mids and content_hash
$old_mime = undef;
my $mark;
foreach my $mid (@$mids) {
- my %gone; # num => [ smsg, raw ]
+ my %gone; # num => [ smsg, $mime, raw ]
my ($id, $prev);
while (my $smsg = $over->next_by_mid($mid, \$id, \$prev)) {
my $msg = get_blob($self, $smsg);
next; # continue
}
my $orig = $$msg;
- my $cur = PublicInbox::MIME->new($msg);
- if (content_matches($cids, $cur)) {
- $smsg->{mime} = $cur;
- $gone{$smsg->{num}} = [ $smsg, \$orig ];
+ my $cur = PublicInbox::Eml->new($msg);
+ if (content_matches($chashes, $cur)) {
+ $gone{$smsg->{num}} = [ $smsg, $cur, \$orig ];
}
}
my $n = scalar keys %gone;
join(',', sort keys %gone), "\n";
}
foreach my $num (keys %gone) {
- my ($smsg, $orig) = @{$gone{$num}};
- # $removed should only be set once assuming
+ my ($smsg, $mime, $orig) = @{$gone{$num}};
+ # @removed should only be set once assuming
# no bugs in our deduplication code:
- $removed = $smsg;
+ @removed = (undef, $mime, $smsg);
my $oid = $smsg->{blob};
if ($replace_map) {
$replace_map->{$oid} = $sref;
} else {
($mark, undef) = $im->remove($orig, $cmt_msg);
+ $removed[0] = $mark;
}
$orig = undef;
if ($need_reindex) { # ->replace
my $rewrites = _replace_oids($self, $new_mime, $replace_map);
return { rewrites => $rewrites, need_reindex => $need_reindex };
}
- $removed;
+ defined($mark) ? @removed : undef;
}
-# public
+# public (see PublicInbox::Import->remove), but note the 3rd element
+# (retval[2]) is not part of the stable API shared with Import->remove
sub remove {
my ($self, $mime, $cmt_msg) = @_;
+ my @ret;
$self->{-inbox}->with_umask(sub {
- rewrite_internal($self, $mime, $cmt_msg);
+ @ret = rewrite_internal($self, $mime, $cmt_msg);
});
+ defined($ret[0]) ? @ret : undef;
}
sub _replace ($$;$$) {
print $tmp_fh $$raw or die "print \$tmp_fh: $!";
sysseek($tmp_fh, 0, 0) or die "seek failed: $!";
- my ($r, $w);
- pipe($r, $w) or die "failed to create pipe: $!";
- my $rdr = { 0 => fileno($tmp_fh), 1 => fileno($w) };
my $git_dir = $self->{-inbox}->git->{git_dir};
my $cmd = ['git', "--git-dir=$git_dir", qw(hash-object --stdin)];
- my $pid = spawn($cmd, undef, $rdr);
- close $w;
+ my $r = popen_rd($cmd, undef, { 0 => $tmp_fh });
local $/ = "\n";
chomp(my $oid = <$r>);
- waitpid($pid, 0) == $pid or die "git hash-object did not finish";
- die "git hash-object failed: $?" if $?;
+ close $r or die "git hash-object failed: $?";
$oid =~ /\A[a-f0-9]{40}\z/ or die "OID not expected: $oid";
$oid;
}
}
# make sure we really got the OID:
- my ($oid, $type, $len) = $self->{-inbox}->git->check($expect_oid);
- $oid eq $expect_oid or die "BUG: $expect_oid not found after replace";
+ my ($blob, $type, $bytes) = $self->{-inbox}->git->check($expect_oid);
+ $blob eq $expect_oid or die "BUG: $expect_oid not found after replace";
# don't leak FDs to Xapian:
$self->{-inbox}->git->cleanup;
# reindex modified messages:
for my $smsg (@$need_reindex) {
- my $num = $smsg->{num};
- my $mid0 = $smsg->{mid};
- do_idx($self, \$raw, $new_mime, $len, $num, $oid, $mid0);
+ my $new_smsg = bless {
+ blob => $blob,
+ raw_bytes => $bytes,
+ num => $smsg->{num},
+ mid => $smsg->{mid},
+ }, 'PublicInbox::Smsg';
+ my $v2w = { autime => $smsg->{ds}, cotime => $smsg->{ts} };
+ $new_smsg->populate($new_mime, $v2w);
+ do_idx($self, \$raw, $new_mime, $new_smsg);
}
$rewritten->{rewrites};
}
my $bnote = $self->{bnote} or return;
my $r = $bnote->[0];
while (scalar keys %$barrier) {
- defined(my $l = $r->getline) or die "EOF on barrier_wait: $!";
+ defined(my $l = readline($r)) or die "EOF on barrier_wait: $!";
$l =~ /\Abarrier (\d+)/ or die "bad line on barrier_wait: $l";
delete $barrier->{$1} or die "bad shard[$1] on barrier wait";
}
$dbh->begin_work;
}
+ $self->{total_bytes} += $self->{transact_bytes};
$self->{transact_bytes} = 0;
}
}
$self->{over}->disconnect;
delete $self->{bnote};
- $self->{transact_bytes} = 0;
- $self->lock_release if $shards;
+ my $nbytes = $self->{total_bytes};
+ $self->{total_bytes} = 0;
+ $self->lock_release(!!$nbytes) if $shards;
$self->{-inbox}->git->cleanup;
}
unless (-d $all) {
PublicInbox::Import::init_bare($all);
}
- my $alt = "$all/objects/info/alternates";
- my %alts;
- my @add;
+ my $info_dir = "$all/objects/info";
+ my $alt = "$info_dir/alternates";
+ my (%alt, $new);
+ my $mode = 0644;
if (-e $alt) {
open(my $fh, '<', $alt) or die "open < $alt: $!\n";
- %alts = map { chomp; $_ => 1 } (<$fh>);
+ $mode = (stat($fh))[2] & 07777;
+
+ # we assign a sort score to every alternate and favor
+ # the newest (highest numbered) one when we
+ my $score;
+ my $other = 0; # in case admin adds non-epoch repos
+ %alt = map {;
+ if (m!\A\Q../../\E([0-9]+)\.git/objects\z!) {
+ $score = $1 + 0;
+ } else {
+ $score = --$other;
+ }
+ $_ => $score;
+ } split(/\n+/, do { local $/; <$fh> });
}
+
foreach my $i (0..$epoch) {
my $dir = "../../git/$i.git/objects";
- push @add, $dir if !$alts{$dir} && -d "$pfx/$i.git";
- }
- return unless @add;
- open my $fh, '>>', $alt or die "open >> $alt: $!\n";
- foreach my $dir (@add) {
- print $fh "$dir\n" or die "print >> $alt: $!\n";
+ if (!exists($alt{$dir}) && -d "$pfx/$i.git") {
+ $alt{$dir} = $i;
+ $new = 1;
+ }
}
- close $fh or die "close $alt: $!\n";
+ return unless $new;
+
+ my ($fh, $tmp) = tempfile('alt-XXXXXXXX', DIR => $info_dir);
+ print $fh join("\n", sort { $alt{$b} <=> $alt{$a} } keys %alt), "\n"
+ or die "print $tmp: $!\n";
+ chmod($mode, $fh) or die "fchmod $tmp: $!\n";
+ close $fh or die "close $tmp $!\n";
+ rename($tmp, $alt) or die "rename $tmp => $alt: $!\n";
}
sub git_init {
my ($self, $epoch) = @_;
my $git_dir = "$self->{-inbox}->{inboxdir}/git/$epoch.git";
- my @cmd = (qw(git init --bare -q), $git_dir);
- PublicInbox::Import::run_die(\@cmd);
- @cmd = (qw/git config/, "--file=$git_dir/config",
+ PublicInbox::Import::init_bare($git_dir);
+ my @cmd = (qw/git config/, "--file=$git_dir/config",
'include.path', '../../all.git/config');
PublicInbox::Import::run_die(\@cmd);
fill_alternates($self, $epoch);
my ($self, $git, $packed_bytes, $tmp) = @_;
my $im = PublicInbox::Import->new($git, undef, undef, $self->{-inbox});
$im->{bytes_added} = int($packed_bytes / $PACKING_FACTOR);
- $im->{want_object_info} = 1;
$im->{lock_path} = undef;
$im->{path_type} = 'v2';
$self->{im} = $im unless $tmp;
my $cmd = [ qw(diff -u), $an, $bn ];
print STDERR "# MID conflict <$mid>\n";
my $pid = spawn($cmd, undef, { 1 => 2 });
- defined $pid or die "diff failed to spawn $!";
waitpid($pid, 0) == $pid or die "diff did not finish";
unlink($an, $bn);
}
$ibx->msg_by_smsg($smsg);
}
-sub lookup_content ($$$) {
+sub content_exists ($$$) {
my ($self, $mime, $mid) = @_;
my $over = $self->{over};
- my $cids = content_ids($mime);
+ my $chashes = content_hashes($mime);
my ($id, $prev);
while (my $smsg = $over->next_by_mid($mid, \$id, \$prev)) {
my $msg = get_blob($self, $smsg);
warn "broken smsg for $mid\n";
next;
}
- my $cur = PublicInbox::MIME->new($msg);
- if (content_matches($cids, $cur)) {
- $smsg->{mime} = $cur;
- return $smsg;
- }
-
+ my $cur = PublicInbox::Eml->new($msg);
+ return 1 if content_matches($chashes, $cur);
# XXX DEBUG_DIFF is experimental and may be removed
diff($mid, $cur, $mime) if $ENV{DEBUG_DIFF};
sub mark_deleted ($$$$) {
my ($self, $sync, $git, $oid) = @_;
+ return if PublicInbox::SearchIdx::too_big($self, $git, $oid);
my $msgref = $git->cat_file($oid);
- my $mime = PublicInbox::MIME->new($$msgref);
+ my $mime = PublicInbox::Eml->new($$msgref);
my $mids = mids($mime->header_obj);
- my $cid = content_id($mime);
+ my $chash = content_hash($mime);
foreach my $mid (@$mids) {
- $sync->{D}->{"$mid\0$cid"} = $oid;
+ $sync->{D}->{"$mid\0$chash"} = $oid;
}
}
$self->{current_info} = "multi_mid $oid";
my ($num, $mid0, $len);
my $msgref = $git->cat_file($oid, \$len);
- my $mime = PublicInbox::MIME->new($$msgref);
+ my $mime = PublicInbox::Eml->new($$msgref);
my $mids = mids($mime->header_obj);
- my $cid = content_id($mime);
+ my $chash = content_hash($mime);
die "BUG: reindex_oid_m called for <=1 mids" if scalar(@$mids) <= 1;
for my $mid (reverse @$mids) {
- delete($sync->{D}->{"$mid\0$cid"}) and
+ delete($sync->{D}->{"$mid\0$chash"}) and
die "BUG: reindex_oid should handle <$mid> delete";
}
my $over = $self->{over};
}
}
$sync->{nr}++;
- if (do_idx($self, $msgref, $mime, $len, $num, $oid, $mid0)) {
+ my $smsg = bless {
+ raw_bytes => $len,
+ num => $num,
+ blob => $oid,
+ mid => $mid0,
+ }, 'PublicInbox::Smsg';
+ $smsg->populate($mime, $self);
+ if (do_idx($self, $msgref, $mime, $smsg)) {
reindex_checkpoint($self, $sync, $git);
}
}
}
}
-# reuse Msgmap to store num => oid mapping (rather than num => mid)
-sub multi_mid_q_new () {
- my ($fh, $fn) = tempfile('multi_mid-XXXXXXX', EXLOCK => 0, TMPDIR => 1);
- my $multi_mid = PublicInbox::Msgmap->new_file($fn, 1);
- $multi_mid->{dbh}->do('PRAGMA synchronous = OFF');
- # for Msgmap->DESTROY:
- $multi_mid->{tmp_name} = $fn;
- $multi_mid->{pid} = $$;
- close $fh or die "failed to close $fn: $!";
- $multi_mid
-}
-
-sub multi_mid_q_push ($$) {
- my ($sync, $oid) = @_;
- my $multi_mid = $sync->{multi_mid} //= multi_mid_q_new();
+sub multi_mid_q_push ($$$) {
+ my ($self, $sync, $oid) = @_;
+ my $multi_mid = $sync->{multi_mid} //= PublicInbox::MultiMidQueue->new;
if ($sync->{reindex}) { # no regen on reindex
- $multi_mid->mid_insert($oid);
+ $multi_mid->push_oid($oid, $self);
} else {
my $num = $sync->{regen}--;
die "BUG: ran out of article numbers" if $num <= 0;
- $multi_mid->mid_set($num, $oid);
+ $multi_mid->set_oid($num, $oid, $self);
}
}
sub reindex_oid ($$$$) {
my ($self, $sync, $git, $oid) = @_;
+ return if PublicInbox::SearchIdx::too_big($self, $git, $oid);
my ($num, $mid0, $len);
my $msgref = $git->cat_file($oid, \$len);
return if $len == 0; # purged
- my $mime = PublicInbox::MIME->new($$msgref);
+ my $mime = PublicInbox::Eml->new($$msgref);
my $mids = mids($mime->header_obj);
- my $cid = content_id($mime);
+ my $chash = content_hash($mime);
if (scalar(@$mids) == 0) {
warn "E: $oid has no Message-ID, skipping\n";
my $mid = $mids->[0];
# was the file previously marked as deleted?, skip if so
- if (delete($sync->{D}->{"$mid\0$cid"})) {
+ if (delete($sync->{D}->{"$mid\0$chash"})) {
if (!$sync->{reindex}) {
$num = $sync->{regen}--;
$self->{mm}->num_highwater($num);
} else { # multiple MIDs are a weird case:
my $del = 0;
for (@$mids) {
- $del += delete($sync->{D}->{"$_\0$cid"}) // 0;
+ $del += delete($sync->{D}->{"$_\0$chash"}) // 0;
}
if ($del) {
unindex_oid_remote($self, $oid, $_) for @$mids;
# do not delete from {mm_tmp}, since another
# single-MID message may use it.
} else { # handle them at the end:
- multi_mid_q_push($sync, $oid);
+ multi_mid_q_push($self, $sync, $oid);
}
return;
}
$sync->{mm_tmp}->mid_delete($mid0) or
die "failed to delete <$mid0> for article #$num\n";
$sync->{nr}++;
- if (do_idx($self, $msgref, $mime, $len, $num, $oid, $mid0)) {
+ my $smsg = bless {
+ raw_bytes => $len,
+ num => $num,
+ blob => $oid,
+ mid => $mid0,
+ }, 'PublicInbox::Smsg';
+ $smsg->populate($mime, $self);
+ if (do_idx($self, $msgref, $mime, $smsg)) {
reindex_checkpoint($self, $sync, $git);
}
}
my ($self, $git, $oid, $unindexed) = @_;
my $mm = $self->{mm};
my $msgref = $git->cat_file($oid);
- my $mime = PublicInbox::MIME->new($msgref);
+ my $mime = PublicInbox::Eml->new($msgref);
my $mids = mids($mime->header_obj);
$mime = $msgref = undef;
my $over = $self->{over};
$pr->("$i.git indexing $range\n");
}
- my @cmd = qw(log --raw -r --pretty=tformat:%H
+ my @cmd = qw(log --raw -r --pretty=tformat:%H.%at.%ct
--no-notes --no-color --no-abbrev --no-renames);
my $fh = $self->{reindex_pipe} = $git->popen(@cmd, $range);
my $cmt;
while (<$fh>) {
chomp;
$self->{current_info} = "$i.git $_";
- if (/\A$x40$/o && !defined($cmt)) {
- $cmt = $_;
+ if (/\A($x40)\.([0-9]+)\.([0-9]+)$/o) {
+ $cmt //= $1;
+ $self->{autime} = $2;
+ $self->{cotime} = $3;
} elsif (/\A:\d{6} 100644 $x40 ($x40) [AM]\tm$/o) {
reindex_oid($self, $sync, $git, $1);
} elsif (/\A:\d{6} 100644 $x40 ($x40) [AM]\td$/o) {
}
}
close $fh or die "git log failed: \$?=$?";
- delete $self->{reindex_pipe};
+ delete @$self{qw(reindex_pipe autime cotime)};
update_last_commit($self, $git, $i, $cmt) if defined $cmt;
}
return unless defined $latest;
$self->idx_init($opt); # acquire lock
my $sync = {
- D => {}, # "$mid\0$cid" => $oid
+ D => {}, # "$mid\0$chash" => $oid
unindex_range => {}, # EPOCH => oid_old..oid_new
reindex => $opt->{reindex},
-opt => $opt
}
if (my $multi_mid = delete $sync->{multi_mid}) {
$git //= $self->{-inbox}->git;
- my ($min, $max) = $multi_mid->minmax;
+ my $min = $multi_mid->{min};
+ my $max = $multi_mid->{max};
if ($sync->{reindex}) {
# we may need to create new Message-IDs if mirrors
# were initially indexed with old versions
for (my $i = $max; $i >= $min; $i--) {
- my $oid = $multi_mid->mid_for($i);
+ my $oid;
+ $oid = $multi_mid->get_oid($i, $self) or next;
next unless defined $oid;
reindex_oid_m($self, $sync, $git, $oid);
}
} else { # regen on initial index
for my $num ($min..$max) {
- my $oid = $multi_mid->mid_for($num);
- next unless defined $oid;
+ my $oid;
+ $oid = $multi_mid->get_oid($num, $self) or next;
reindex_oid_m($self, $sync, $git, $oid, $num);
}
}