diff options
author | Eric Wong <e@yhbt.net> | 2020-03-20 08:18:20 +0000 |
---|---|---|
committer | Eric Wong <e@yhbt.net> | 2020-03-22 09:00:23 +0000 |
commit | b5bc3576af3d0ef0fa884ed32a674c7a703a19b2 (patch) | |
tree | 990be6a2a7f0440154e7aa903cd430a2735eb975 /lib/PublicInbox/SearchIdxShard.pm | |
parent | 99d6d24847c499387ce65b09305deebfd51f8930 (diff) | |
download | public-inbox-b5bc3576af3d0ef0fa884ed32a674c7a703a19b2.tar.gz |
We can finally get rid of the awkward, ad-hoc use of V2Writable, SearchIdx, and OverIdx args for passing {cotime} and {autime} between classes. We'll still use those git time fields internally within V2Writable and SearchIdx for (re)indexing, but that's not worth avoiding as a fallback.
Diffstat (limited to 'lib/PublicInbox/SearchIdxShard.pm')
-rw-r--r-- | lib/PublicInbox/SearchIdxShard.pm | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/lib/PublicInbox/SearchIdxShard.pm b/lib/PublicInbox/SearchIdxShard.pm index 21e81b16..2b48b1b4 100644 --- a/lib/PublicInbox/SearchIdxShard.pm +++ b/lib/PublicInbox/SearchIdxShard.pm @@ -67,19 +67,19 @@ sub shard_worker_loop ($$$$$) { $self->remove_by_oid($oid, $mid); } else { chomp $line; - my ($bytes, $num, $blob, $mid, $autime, $cotime) = + my ($bytes, $num, $blob, $mid, $ds, $ts) = split(/ /, $line); $self->begin_txn_lazy; 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); - $self->{autime} = $autime; - $self->{cotime} = $cotime; my $smsg = bless { bytes => $bytes, num => $num + 0, blob => $blob, mid => $mid, + ds => $ds, + ts => $ts, }, 'PublicInbox::Smsg'; $self->add_message($mime, $smsg); } @@ -89,17 +89,13 @@ sub shard_worker_loop ($$$$$) { # called by V2Writable sub index_raw { - my ($self, $msgref, $mime, $smsg, $times) = @_; - my $at = $times->{autime} // time; - my $ct = $times->{cotime} // time; + my ($self, $msgref, $mime, $smsg) = @_; if (my $w = $self->{w}) { - print $w join(' ', @$smsg{qw(bytes num blob mid)}, $at, $ct), + 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, $smsg); } } |