X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FSearchIdxShard.pm;h=2b48b1b4154444552a8b144709d0e144447eb068;hb=b5bc3576af3d0ef0fa884ed32a674c7a703a19b2;hp=0522eceae13ada18cd57819ebdc0c1fb12325fe0;hpb=058cc69698d2c0c839043cfa9b868d37c718a9f4;p=public-inbox.git
diff --git a/lib/PublicInbox/SearchIdxShard.pm b/lib/PublicInbox/SearchIdxShard.pm
index 0522ecea..2b48b1b4 100644
--- a/lib/PublicInbox/SearchIdxShard.pm
+++ b/lib/PublicInbox/SearchIdxShard.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2019 all contributors
+# Copyright (C) 2018-2020 all contributors
# License: AGPL-3.0+
# used to interface with a single Xapian shard in V2 repos.
@@ -67,13 +67,21 @@ sub shard_worker_loop ($$$$$) {
$self->remove_by_oid($oid, $mid);
} else {
chomp $line;
- my ($len, $artnum, $oid, $mid0) = split(/ /, $line);
+ my ($bytes, $num, $blob, $mid, $ds, $ts) =
+ 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);
+ my $smsg = bless {
+ bytes => $bytes,
+ num => $num + 0,
+ blob => $blob,
+ mid => $mid,
+ ds => $ds,
+ ts => $ts,
+ }, 'PublicInbox::Smsg';
+ $self->add_message($mime, $smsg);
}
}
$self->worker_done;
@@ -81,14 +89,14 @@ sub shard_worker_loop ($$$$$) {
# called by V2Writable
sub index_raw {
- my ($self, $bytes, $msgref, $artnum, $oid, $mid0, $mime) = @_;
+ my ($self, $msgref, $mime, $smsg) = @_;
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 ds ts)}),
+ "\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->add_message($mime, $smsg);
}
}