-# Copyright (C) 2018-2019 all contributors <meta@public-inbox.org>
+# Copyright (C) 2018-2020 all contributors <meta@public-inbox.org>
# License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
# used to interface with a single Xapian shard in V2 repos.
$self->remove_by_oid($oid, $mid);
} else {
chomp $line;
- my ($len, $artnum, $oid, $mid0) = split(/ /, $line);
+ my ($bytes, $num, $blob, $mid, $autime, $cotime) =
+ split(/ /, $line);
$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->add_message($mime, $n, $artnum, $oid, $mid0);
+ $self->{autime} = $autime;
+ $self->{cotime} = $cotime;
+ my $smsg = bless {
+ bytes => $bytes,
+ num => $num + 0,
+ blob => $blob,
+ mid => $mid,
+ }, 'PublicInbox::Smsg';
+ $self->add_message($mime, $smsg);
}
}
$self->worker_done;
# called by V2Writable
sub index_raw {
- my ($self, $bytes, $msgref, $artnum, $oid, $mid0, $mime) = @_;
+ my ($self, $msgref, $mime, $smsg, $times) = @_;
+ my $at = $times->{autime} // time;
+ my $ct = $times->{cotime} // time;
if (my $w = $self->{w}) {
- print $w "$bytes $artnum $oid $mid0\n", $$msgref or die
- "failed to write shard $!\n";
+ print $w join(' ', @$smsg{qw(bytes num blob mid)}, $at, $ct),
+ "\n", $$msgref or die "failed to write shard $!\n";
} else {
$$msgref = undef;
$self->begin_txn_lazy;
- $self->add_message($mime, $bytes, $artnum, $oid, $mid0);
+ $self->{autime} = $at;
+ $self->{cotime} = $ct;
+ $self->add_message($mime, $smsg);
}
}