sub new {
my ($class, $v2writable, $shard) = @_;
- my $self = $class->SUPER::new($v2writable->{-inbox}, 1, $shard);
+ my $ibx = $v2writable->{-inbox};
+ 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;
$self->remove_by_oid($oid, $mid);
} else {
chomp $line;
- my ($len, $artnum, $oid, $mid0, $autime, $cotime) =
- split(/ /, $line);
+ # n.b. $mid may contain spaces(!)
+ my ($bytes, $num, $blob, $ds, $ts, $mid) =
+ split(/ /, $line, 6);
$self->begin_txn_lazy;
- my $n = read($r, my $msg, $len) or die "read: $!\n";
- $n == $len or die "short read: $n != $len\n";
+ my $n = read($r, my $msg, $bytes) or die "read: $!\n";
+ $n == $bytes or die "short read: $n != $bytes\n";
my $mime = PublicInbox::MIME->new(\$msg);
- $artnum = int($artnum);
- $self->{autime} = $autime;
- $self->{cotime} = $cotime;
my $smsg = bless {
- bytes => $len,
- num => $artnum,
- blob => $oid,
- mid => $mid0,
+ bytes => $bytes,
+ num => $num + 0,
+ blob => $blob,
+ mid => $mid,
+ ds => $ds,
+ ts => $ts,
}, 'PublicInbox::Smsg';
$self->add_message($mime, $smsg);
}
# called by V2Writable
sub index_raw {
- my ($self, $bytes, $msgref, $artnum, $oid, $mid0, $mime, $times) = @_;
- my $at = $times->{autime} // time;
- my $ct = $times->{cotime} // time;
+ my ($self, $msgref, $mime, $smsg) = @_;
if (my $w = $self->{w}) {
- print $w "$bytes $artnum $oid $mid0 $at $ct\n", $$msgref or
- die "failed to write shard $!\n";
+ # mid must be last, it can contain spaces (but not LF)
+ print $w join(' ', @$smsg{qw(bytes num blob ds ts mid)}),
+ "\n", $$msgref or die "failed to write shard $!\n";
} else {
$$msgref = undef;
$self->begin_txn_lazy;
- $self->{autime} = $at;
- $self->{cotime} = $ct;
- my $smsg = bless {
- bytes => $bytes,
- num => $artnum,
- blob => $oid,
- mid => $mid0,
- }, 'PublicInbox::Smsg';
$self->add_message($mime, $smsg);
}
}