use PublicInbox::Eml;
sub new {
- my ($class, $v2writable, $shard) = @_;
- my $ibx = $v2writable->{-inbox};
+ my ($class, $v2w, $shard) = @_;
+ my $ibx = $v2w->{ibx};
my $self = $class->SUPER::new($ibx, 1, $shard);
# create the DB before forking:
- $self->_xdb_acquire;
- $self->set_indexlevel;
- $self->_xdb_release;
- $self->spawn_worker($v2writable, $shard) if $v2writable->{parallel};
+ $self->idx_acquire;
+ $self->set_metadata_once;
+ $self->idx_release;
+ $self->spawn_worker($v2w, $shard) if $v2w->{parallel};
$self;
}
if ($line eq "commit\n") {
$self->commit_txn_lazy;
} elsif ($line eq "close\n") {
- $self->_xdb_release;
+ $self->idx_release;
} elsif ($line eq "barrier\n") {
$self->commit_txn_lazy;
# no need to lock < 512 bytes is atomic under POSIX
print $bnote "barrier $shard\n" or
die "write failed for barrier $!\n";
- } elsif ($line =~ /\AD ([a-f0-9]{40,}) (.+)\n\z/s) {
- my ($oid, $mid) = ($1, $2);
- $self->begin_txn_lazy;
- $self->remove_by_oid($oid, $mid);
+ } elsif ($line =~ /\AD ([a-f0-9]{40,}) ([0-9]+)\n\z/s) {
+ $self->remove_by_oid($1, $2 + 0);
} else {
chomp $line;
# n.b. $mid may contain spaces(!)
# called by V2Writable
sub index_raw {
- my ($self, $msgref, $mime, $smsg) = @_;
+ my ($self, $msgref, $eml, $smsg) = @_;
if (my $w = $self->{w}) {
# mid must be last, it can contain spaces (but not LF)
print $w join(' ', @$smsg{qw(raw_bytes bytes
num blob ds ts mid)}),
"\n", $$msgref or die "failed to write shard $!\n";
} else {
- $$msgref = undef;
+ if ($eml) {
+ $$msgref = undef;
+ } else { # --xapian-only + --sequential-shard:
+ $eml = PublicInbox::Eml->new($msgref);
+ }
$self->begin_txn_lazy;
- $self->add_message($mime, $smsg);
+ $self->add_message($eml, $smsg);
}
}