# Now that all subprocesses are up, we can open the FDs
# for SQLite:
- my $mm = $self->{mm} = PublicInbox::Msgmap->new_file(
- "$ibx->{inboxdir}/msgmap.sqlite3",
- $ibx->{-no_fsync} ? 2 : 1);
+ my $mm = $self->{mm} = PublicInbox::Msgmap->new_file($ibx, 1);
$mm->{dbh}->begin_work;
}
}
my $shards = $self->{idx_shards};
if ($shards) {
- my $mm = $self->{mm};
- my $dbh = $mm->{dbh} if $mm;
+ my $dbh = $self->{mm}->{dbh} if $self->{mm};
# SQLite msgmap data is second in importance
$dbh->commit if $dbh;
+ eval { $dbh->do('PRAGMA optimize') };
# SQLite overview is third
$self->{oidx}->commit_lazy;
my $m = $err ? 'rollback' : 'commit';
eval { $mm->{dbh}->$m };
$err .= "msgmap $m: $@\n" if $@;
- eval { $mm->{dbh}->do('PRAGMA optimize') };
- $err .= "msgmap optimize: $@\n" if $@;
}
- if ($self->{oidx} && $self->{oidx}->{dbh}) {
- if ($err) {
- eval { $self->{oidx}->rollback_lazy };
- $err .= "overview rollback: $@\n" if $@;
- }
- eval { $self->{oidx}->{dbh}->do('PRAGMA optimize') };
- $err .= "overview optimize: $@\n" if $@;
+ if ($self->{oidx} && $self->{oidx}->{dbh} && $err) {
+ eval { $self->{oidx}->rollback_lazy };
+ $err .= "overview rollback: $@\n" if $@;
}
my $shards = delete $self->{idx_shards};
}
}
}
+ my $oidx = $self->{oidx};
if (!defined($num)) { # reuse if reindexing (or duplicates)
- my $oidx = $self->{oidx};
for my $mid (@$mids) {
($num, $mid0) = $oidx->num_mid0_for_oid($oid, $mid);
last if defined $num;
}
$mid0 //= do { # is this a number we got before?
$num = $arg->{mm_tmp}->num_for($mids->[0]);
+
+ # don't clobber existing if Message-ID is reused:
+ if (my $x = defined($num) ? $oidx->get_art($num) : undef) {
+ undef($num) if $x->{blob} ne $oid;
+ }
defined($num) ? $mids->[0] : undef;
};
if (!defined($num)) {