replace most uses of PublicInbox::MIME with Eml

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

diff --git a/lib/PublicInbox/SearchIdxShard.pm b/lib/PublicInbox/SearchIdxShard.pm
index ee176e504298dd5e1b1685c94dd5bcfc53d38f14..e754b038c54b0b5f4a83cdef61496eb4dcfdf2fd 100644 (file)
--- a/lib/PublicInbox/SearchIdxShard.pm
+++ b/lib/PublicInbox/SearchIdxShard.pm
@@ -8,12 +8,15 @@ use strict;
 use warnings;
 use base qw(PublicInbox::SearchIdx);
 use IO::Handle (); # autoflush
+use PublicInbox::Eml;
 
 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;
@@ -67,13 +70,22 @@ sub shard_worker_loop ($$$$$) {
                        $self->remove_by_oid($oid, $mid);
                } else {
                        chomp $line;
-                       my ($len, $artnum, $oid, $mid0) = 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 $mime = PublicInbox::MIME->new(\$msg);
-                       $artnum = int($artnum);
-                       $self->add_message($mime, $n, $artnum, $oid, $mid0);
+                       my $n = read($r, my $msg, $bytes) or die "read: $!\n";
+                       $n == $bytes or die "short read: $n != $bytes\n";
+                       my $mime = PublicInbox::Eml->new(\$msg);
+                       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 +93,15 @@ 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";
+               # 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->add_message($mime, $bytes, $artnum, $oid, $mid0);
+               $self->add_message($mime, $smsg);
        }
 }