use parent qw(PublicInbox::ExtSearch PublicInbox::Lock);
use Carp qw(croak carp);
use PublicInbox::Search;
-use PublicInbox::SearchIdx qw(crlf_adjust);
+use PublicInbox::SearchIdx qw(crlf_adjust prepare_stack is_ancestor);
use PublicInbox::OverIdx;
+use PublicInbox::MID qw(mids);
use PublicInbox::V2Writable;
use PublicInbox::InboxWritable;
+use PublicInbox::ContentHash qw(content_hash);
use PublicInbox::Eml;
use File::Spec;
sub new {
- my (undef, $dir, $opt, $shard) = @_;
+ my (undef, $dir, $opt) = @_;
+ $dir = File::Spec->canonpath($dir);
my $l = $opt->{indexlevel} // 'full';
$l !~ $PublicInbox::SearchIdx::INDEXLEVELS and
die "invalid indexlevel=$l\n";
sub attach_inbox {
my ($self, $ibx) = @_;
+ $ibx = PublicInbox::InboxWritable->new($ibx);
my $key = $ibx->eidx_key;
if (!$ibx->over || !$ibx->mm) {
warn "W: skipping $key (unindexed)\n";
$size == 0 ? 1 : 0; # size == 0 means purged
}
+sub check_batch_limit ($) {
+ my ($req) = @_;
+ my $self = $req->{self};
+ my $new_smsg = $req->{new_smsg};
+
+ # {raw_bytes} may be unset, so just use {bytes}
+ my $n = $self->{transact_bytes} += $new_smsg->{bytes};
+
+ # set flag for PublicInbox::V2Writable::index_todo:
+ ${$req->{need_checkpoint}} = 1 if $n >= $self->{batch_bytes};
+}
+
sub do_xpost ($$) {
my ($req, $smsg) = @_;
my $self = $req->{self};
my $eml = $req->{eml};
if (my $new_smsg = $req->{new_smsg}) { # 'm' on cross-posted message
my $xnum = $req->{xnum};
- $idx->shard_add_xref3($docid, $xnum, $oid, $xibx, $eml);
+ $self->{oidx}->add_xref3($docid, $xnum, $oid, $xibx->eidx_key);
+ $idx->shard_add_eidx_info($docid, $oid, $xibx, $eml);
+ check_batch_limit($req);
} else { # 'd'
- $idx->shard_remove_xref3($docid, $oid, $xibx, $eml);
+ $self->{oidx}->remove_xref3($docid, $oid, $xibx->eidx_key);
+ $idx->shard_remove_eidx_info($docid, $oid, $xibx, $eml);
}
}
# called by V2Writable::sync_prepare
-sub artnum_max { $_[0]->{oidx}->get_counter('eidx_docid') }
+sub artnum_max { $_[0]->{oidx}->eidx_max }
sub index_unseen ($) {
my ($req) = @_;
$new_smsg->{num} = $docid;
my $idx = $self->idx_shard($docid);
$self->{oidx}->add_overview($eml, $new_smsg);
- $idx->index_raw(undef, $eml, $new_smsg, $req->{ibx});
+ my $oid = $new_smsg->{blob};
+ my $ibx = delete $req->{ibx} or die 'BUG: {ibx} unset';
+ $self->{oidx}->add_xref3($docid, $req->{xnum}, $oid, $ibx->eidx_key);
+ $idx->index_raw(undef, $eml, $new_smsg, $ibx);
+ check_batch_limit($req);
}
sub do_finalize ($) {
} elsif (exists $req->{new_smsg}) { # totally unseen messsage
index_unseen($req);
} else {
- warn "W: ignoring delete $req->{oid} (not found)\n";
+ # `d' message was already unindexed in the v1/v2 inboxes,
+ # so it's too noisy to warn, here.
}
}
do_finalize($req);
}
+sub _blob_missing ($) { # called when req->{cur_smsg}->{blob} is bad
+ my ($req) = @_;
+ my $smsg = $req->{cur_smsg} or die 'BUG: {cur_smsg} missing';
+ my $self = $req->{self};
+ my $xref3 = $self->{oidx}->get_xref3($smsg->{num});
+ my @keep = grep(!/:$smsg->{blob}\z/, @$xref3);
+ if (@keep) {
+ $keep[0] =~ /:([a-f0-9]{40,}+)\z/ or
+ die "BUG: xref $keep[0] has no OID";
+ my $oidhex = $1;
+ $self->{oidx}->remove_xref3($smsg->{num}, $smsg->{blob});
+ my $upd = $self->{oidx}->update_blob($smsg, $oidhex);
+ my $saved = $self->{oidx}->get_art($smsg->{num});
+ } else {
+ $self->{oidx}->delete_by_num($smsg->{num});
+ }
+}
+
sub ck_existing { # git->cat_async callback
my ($bref, $oid, $type, $size, $req) = @_;
my $smsg = $req->{cur_smsg} or die 'BUG: {cur_smsg} missing';
- return if is_bad_blob($oid, $type, $size, $smsg->{blob});
- my $cur = PublicInbox::Eml->new($bref);
- if (content_digest($cur) eq $req->{chash}) {
- push @{$req->{indexed}}, $smsg; # for do_xpost
- } # else { index_unseen later }
+ if ($type eq 'missing') {
+ _blob_missing($req);
+ } elsif (!is_bad_blob($oid, $type, $size, $smsg->{blob})) {
+ my $cur = PublicInbox::Eml->new($bref);
+ if (content_hash($cur) eq $req->{chash}) {
+ push @{$req->{indexed}}, $smsg; # for do_xpost
+ } # else { index_unseen later }
+ }
do_step($req);
}
sub index_oid { # git->cat_async callback for 'm'
my ($bref, $oid, $type, $size, $req) = @_;
+ my $self = $req->{self};
+ local $self->{current_info} = "$self->{current_info} $oid";
return if is_bad_blob($oid, $type, $size, $req->{oid});
my $new_smsg = $req->{new_smsg} = bless {
blob => $oid,
}, 'PublicInbox::Smsg';
$new_smsg->{bytes} = $size + crlf_adjust($$bref);
defined($req->{xnum} = cur_ibx_xnum($req, $bref)) or return;
+ ++${$req->{nr}};
do_step($req);
}
sub unindex_oid { # git->cat_async callback for 'd'
my ($bref, $oid, $type, $size, $req) = @_;
+ my $self = $req->{self};
+ local $self->{current_info} = "$self->{current_info} $oid";
return if is_bad_blob($oid, $type, $size, $req->{oid});
return if defined(cur_ibx_xnum($req, $bref)); # was re-added
do_step($req);
-opt => $opt,
self => $self,
ibx => $ibx,
+ nr => \(my $nr = 0),
+ -regen_fmt => "%u/?\n",
};
my $v = $ibx->version;
my $ekey = $ibx->eidx_key;
my $epoch_max;
defined($ibx->git_dir_latest(\$epoch_max)) or return;
$sync->{epoch_max} = $epoch_max;
- sync_prepare($self, $sync) or return;
- index_epoch($self, $sync, $_) for (0..$epoch_max);
+ sync_prepare($self, $sync) or return; # fills $sync->{todo}
} elsif ($v == 1) {
my $uv = $ibx->uidvalidity;
my $lc = $self->{oidx}->eidx_meta("lc-v1:$ekey//$uv");
- prepare_stack($sync, $lc ? "$lc..HEAD" : 'HEAD');
+ my $stk = prepare_stack($sync, $lc ? "$lc..HEAD" : 'HEAD');
+ my $unit = { stack => $stk, git => $ibx->git };
+ push @{$sync->{todo}}, $unit;
} else {
warn "E: $ekey unsupported inbox version (v$v)\n";
return;
}
+ index_todo($self, $sync, $_) for @{$sync->{todo}};
}
sub eidx_sync { # main entry point
$self->idx_init($opt); # acquire lock via V2Writable::_idx_init
$self->{oidx}->rethread_prepare($opt);
- _sync_inbox($self, $opt, $_) for (@{$self->{ibx_list}});
+ my $warn_cb = $SIG{__WARN__} || sub { print STDERR @_ };
+ local $self->{current_info} = '';
+ local $SIG{__WARN__} = sub {
+ $warn_cb->($self->{current_info}, ': ', @_);
+ };
+
+ # don't use $_ here, it'll get clobbered by reindex_checkpoint
+ for my $ibx (@{$self->{ibx_list}}) {
+ _sync_inbox($self, $opt, $ibx);
+ }
+
+ $self->{oidx}->rethread_done($opt);
+
+ PublicInbox::V2Writable::done($self);
+}
+
+sub update_last_commit { # overrides V2Writable
+ my ($self, $sync, $unit, $latest_cmt) = @_;
+ return unless defined $latest_cmt;
+
+ $self->git->async_wait_all;
+ my $ibx = $sync->{ibx} or die 'BUG: {ibx} missing';
+ my $ekey = $ibx->eidx_key;
+ my $uv = $ibx->uidvalidity;
+ my $epoch = $unit->{epoch};
+ my $meta_key;
+ my $v = $ibx->version;
+ if ($v == 2) {
+ die 'No {epoch} for v2 unit' unless defined $epoch;
+ $meta_key = "lc-v2:$ekey//$uv;$epoch";
+ } elsif ($v == 1) {
+ die 'Unexpected {epoch} for v1 unit' if defined $epoch;
+ $meta_key = "lc-v1:$ekey//$uv";
+ } else {
+ die "Unsupported inbox version: $v";
+ }
+ my $last = $self->{oidx}->eidx_meta($meta_key);
+ if (defined $last && is_ancestor($unit->{git}, $last, $latest_cmt)) {
+ my @cmd = (qw(rev-list --count), "$last..$latest_cmt");
+ chomp(my $n = $unit->{git}->qx(@cmd));
+ return if $n ne '' && $n == 0;
+ }
+ $self->{oidx}->eidx_meta($meta_key, $latest_cmt);
}
sub idx_init { # similar to V2Writable
$new{$line} = 1;
push @new, $line;
}
- push @old, @new;
- PublicInbox::V2Writable::write_alternates($info_dir, $mode, \@old);
+ if (scalar @new) {
+ push @old, @new;
+ my $o = \@old;
+ PublicInbox::V2Writable::write_alternates($info_dir, $mode, $o);
+ }
$self->parallel_init($self->{indexlevel});
$self->umask_prepare;
$self->with_umask(\&PublicInbox::V2Writable::_idx_init, $self, $opt);
*parallel_init = \&PublicInbox::V2Writable::parallel_init;
*nproc_shards = \&PublicInbox::V2Writable::nproc_shards;
*sync_prepare = \&PublicInbox::V2Writable::sync_prepare;
-*index_epoch = \&PublicInbox::V2Writable::index_epoch;
+*index_todo = \&PublicInbox::V2Writable::index_todo;
+*count_shards = \&PublicInbox::V2Writable::count_shards;
+*atfork_child = \&PublicInbox::V2Writable::atfork_child;
+*idx_shard = \&PublicInbox::V2Writable::idx_shard;
1;