idx_stack: avoid conditional hash assignment weirdness

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

diff --git a/lib/PublicInbox/IdxStack.pm b/lib/PublicInbox/IdxStack.pm
index b43b8064e5e2717e41d229193a83db117ab27e6a..54d480bdd3710fe8ffa2418c665313d609688d27 100644 (file)
--- a/lib/PublicInbox/IdxStack.pm
+++ b/lib/PublicInbox/IdxStack.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2020 all contributors <meta@public-inbox.org>
+# Copyright (C) 2020-2021 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 
 # temporary stack for public-inbox-index
@@ -6,19 +6,27 @@ package PublicInbox::IdxStack;
 use v5.10.1;
 use strict;
 use Fcntl qw(:seek);
-use constant FMT => eval { pack('Q', 1) } ? 'A1QQH*' : 'A1IIH*';
+use constant PACK_FMT => eval { pack('Q', 1) } ? 'A1QQH*H*' : 'A1IIH*H*';
 
 # start off in write-only mode
 sub new {
        open(my $io, '+>', undef) or die "open: $!";
+       # latest_cmt is still useful when the newest revision is a `d'(elete),
+       # otherwise we favor $sync->{latest_cmt} for checkpoints and {quit}
        bless { wr => $io, latest_cmt => $_[1] }, __PACKAGE__
 }
 
-# file_char = [a|m]
+# file_char = [d|m]
 sub push_rec {
-       my ($self, $file_char, $at, $ct, $blob_oid) = @_;
-       my $rec = pack(FMT, $file_char, $at, $ct, $blob_oid);
-       $self->{rec_size} //= length($rec);
+       my ($self, $file_char, $at, $ct, $blob_oid, $cmt_oid) = @_;
+       my $rec = pack(PACK_FMT, $file_char, $at, $ct, $blob_oid, $cmt_oid);
+       $self->{unpack_fmt} // do {
+               my $len = length($cmt_oid);
+               my $fmt = PACK_FMT;
+               $fmt =~ s/H\*/H$len/g;
+               $self->{rec_size} = length($rec);
+               $self->{unpack_fmt} = $fmt;
+       };
        print { $self->{wr} } $rec or die "print: $!";
        $self->{tot_size} += length($rec);
 }
@@ -46,7 +54,7 @@ sub pop_rec {
        my $r = read($io, my $buf, $sz);
        defined($r) or die "read: $!";
        $r == $sz or die "read($r != $sz)";
-       unpack(FMT, $buf);
+       unpack($self->{unpack_fmt}, $buf);
 }
 
 1;