# fixup from old bugs:
$nr = $self->{oidx}->dbh->do(<<'');
-DELETE FROM over WHERE num NOT IN (SELECT docid FROM xref3)
+DELETE FROM over WHERE num > 0 AND num NOT IN (SELECT docid FROM xref3)
warn "I: eliminated $nr stale over entries\n" if $nr != 0;
reindex_checkpoint($self, $sync) if checkpoint_due($sync);
my ($cur) = $self->{oidx}->dbh->selectrow_array(<<EOM);
-SELECT MIN(num) FROM over
+SELECT MIN(num) FROM over WHERE num > 0
EOM
$cur // return; # empty
my ($r, $n, %active);
my $ibx_id = $ibx->{-ibx_id};
my $slice = 1000;
my ($beg, $end) = (1, $slice);
+ my $err = sync_inbox($self, $sync, $ibx) and return;
+ my $max = $ibx->over->max;
+ $end = $max if $end > $max;
# first, check if we missed any messages in target $ibx
my $msgs;
${$sync->{nr}} = $beg;
$beg = $msgs->[-1]->{num} + 1;
$end = $beg + $slice;
+ $end = $max if $end > $max;
if (checkpoint_due($sync)) {
reindex_checkpoint($self, $sync); # release lock
}
$del->execute;
# get_xref3 over-fetches, but this is a rare path:
- my $xr3 = $self->{oidx}->get_xref3($docid);
+ my $xr3 = $self->{oidx}->get_xref3($docid, 1);
my $idx = $self->idx_shard($docid);
if (scalar(@$xr3) == 0) { # all gone
$self->{oidx}->delete_by_num($docid);
$self->{oidx}->eidxq_del($docid);
$idx->ipc_do('xdb_remove', $docid);
} else { # enqueue for reindex of remaining messages
- $idx->ipc_do('remove_eidx_info',
- $docid, $ibx->eidx_key);
+ $idx->ipc_do('remove_eidx_info', $docid, $ekey);
$self->{oidx}->eidxq_add($docid); # yes, add
}
}
my $err = _sync_inbox($self, $sync, $ibx);
delete @$ibx{qw(mm over)};
warn $err, "\n" if defined($err);
+ $err;
}
sub dd_smsg { # git->cat_async callback