*idx: pass smsg in even more places

[public-inbox.git] / lib / PublicInbox / SearchIdxShard.pm

diff --git a/lib/PublicInbox/SearchIdxShard.pm b/lib/PublicInbox/SearchIdxShard.pm
index 74c624a4d3dddcb67ac5938aaa1f5186c34284e1..2b48b1b4154444552a8b144709d0e144447eb068 100644 (file)
--- a/lib/PublicInbox/SearchIdxShard.pm
+++ b/lib/PublicInbox/SearchIdxShard.pm
@@ -67,16 +67,21 @@ sub shard_worker_loop ($$$$$) {
                        $self->remove_by_oid($oid, $mid);
                } else {
                        chomp $line;
-                       my ($len, $artnum, $oid, $mid0, $autime, $cotime) =
+                       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->{autime} = $autime;
-                       $self->{cotime} = $cotime;
-                       $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;
@@ -84,18 +89,14 @@ sub shard_worker_loop ($$$$$) {
 
 # 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";
+               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->{autime} = $at;
-               $self->{cotime} = $ct;
-               $self->add_message($mime, $bytes, $artnum, $oid, $mid0);
+               $self->add_message($mime, $smsg);
        }
 }