From: Eric Wong <e@yhbt.net> To: meta@public-inbox.org Subject: [PATCH 05/20] v2writable: move {autime} and {cotime} into $sync state Date: Fri, 24 Jul 2020 05:55:51 +0000 [thread overview] Message-ID: <20200724055606.27332-6-e@yhbt.net> (raw) In-Reply-To: <20200724055606.27332-1-e@yhbt.net> The V2Writable object may be long-lived, so it makes more sense to put the {autime} and {cotime} fields into the shorter-lived index_sync state. --- lib/PublicInbox/Smsg.pm | 8 ++++---- lib/PublicInbox/V2Writable.pm | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/lib/PublicInbox/Smsg.pm b/lib/PublicInbox/Smsg.pm index 725d42062..aaf88f355 100644 --- a/lib/PublicInbox/Smsg.pm +++ b/lib/PublicInbox/Smsg.pm @@ -96,7 +96,7 @@ sub from_mitem { # for Import and v1 non-SQLite WWW code paths sub populate { - my ($self, $hdr, $v2w) = @_; + my ($self, $hdr, $sync) = @_; for my $f (qw(From To Cc Subject)) { my @all = $hdr->header($f); my $val = join(', ', @all); @@ -117,9 +117,9 @@ sub populate { } $self->{$f} = $val if $val ne ''; } - $v2w //= {}; - $self->{-ds} = [ my @ds = msg_datestamp($hdr, $v2w->{autime}) ]; - $self->{-ts} = [ my @ts = msg_timestamp($hdr, $v2w->{cotime}) ]; + $sync //= {}; + $self->{-ds} = [ my @ds = msg_datestamp($hdr, $sync->{autime}) ]; + $self->{-ts} = [ my @ts = msg_timestamp($hdr, $sync->{cotime}) ]; $self->{ds} //= $ds[0]; # no zone $self->{ts} //= $ts[0]; diff --git a/lib/PublicInbox/V2Writable.pm b/lib/PublicInbox/V2Writable.pm index c896dc0ed..4dc6880b4 100644 --- a/lib/PublicInbox/V2Writable.pm +++ b/lib/PublicInbox/V2Writable.pm @@ -564,8 +564,8 @@ W: $list num => $smsg->{num}, mid => $smsg->{mid}, }, 'PublicInbox::Smsg'; - my $v2w = { autime => $smsg->{ds}, cotime => $smsg->{ts} }; - $new_smsg->populate($new_mime, $v2w); + my $sync = { autime => $smsg->{ds}, cotime => $smsg->{ts} }; + $new_smsg->populate($new_mime, $sync); do_idx($self, \$raw, $new_mime, $new_smsg); } $rewritten->{rewrites}; @@ -950,7 +950,7 @@ sub reindex_oid ($$$$) { blob => $oid, mid => $mid0, }, 'PublicInbox::Smsg'; - $smsg->populate($mime, $self); + $smsg->populate($mime, $sync); if (do_idx($self, $msgref, $mime, $smsg)) { reindex_checkpoint($self, $sync, $git); } @@ -1225,14 +1225,14 @@ sub index_epoch ($$$) { while (my ($f, $at, $ct, $oid) = $stk->pop_rec) { $self->{current_info} = "$i.git $oid"; if ($f eq 'm') { - $self->{autime} = $at; - $self->{cotime} = $ct; + $sync->{autime} = $at; + $sync->{cotime} = $ct; reindex_oid($self, $sync, $git, $oid); } elsif ($f eq 'd') { unindex_oid($self, $git, $oid); } } - delete @$self{qw(autime cotime)}; + delete @$sync{qw(autime cotime)}; update_last_commit($self, $git, $i, $stk->{latest_cmt}); }
next prev parent reply other threads:[~2020-07-24 5:56 UTC|newest] Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-07-24 5:55 [PATCH 00/20] indexing changes and new features Eric Wong 2020-07-24 5:55 ` [PATCH 01/20] index: support --rethread switch to fix old indices Eric Wong 2020-07-24 5:55 ` [PATCH 02/20] v2: index forwards (via `git log --reverse') Eric Wong 2020-07-24 5:55 ` [PATCH 03/20] v2writable: introduce idx_stack Eric Wong 2020-07-24 5:55 ` [PATCH 04/20] v2writable: index_sync: reduce fill_alternates calls Eric Wong 2020-07-24 5:55 ` Eric Wong [this message] 2020-07-24 5:55 ` [PATCH 06/20] v2writable: allow >= 40 byte git object IDs Eric Wong 2020-07-24 5:55 ` [PATCH 07/20] v2writable: drop "EPOCH.git indexing $RANGE" progress Eric Wong 2020-07-24 5:55 ` [PATCH 08/20] use consistent {ibx} field for writable code paths Eric Wong 2020-07-24 5:55 ` [PATCH 09/20] search: avoid copying {inboxdir} Eric Wong 2020-07-24 5:55 ` [PATCH 10/20] v2writable: use read-only PublicInbox::Git for cat_file Eric Wong 2020-07-24 5:55 ` [PATCH 11/20] v2writable: get rid of {reindex_pipe} field Eric Wong 2020-07-24 5:55 ` [PATCH 12/20] v2writable: clarify "epoch" comment Eric Wong 2020-07-24 5:55 ` [PATCH 13/20] xapcmd: set {from} properly for v1 inboxes Eric Wong 2020-07-24 5:56 ` [PATCH 14/20] searchidx: rename _xdb_{acquire,release} => idx_ Eric Wong 2020-07-24 5:56 ` [PATCH 15/20] searchidx: make v1 indexing closer to v2 Eric Wong 2020-07-24 5:56 ` [PATCH 16/20] index+xcpdb: support --no-sync flag Eric Wong 2020-07-24 5:56 ` [PATCH 17/20] v2writable: share log2stack code with v1 Eric Wong 2020-07-24 5:56 ` [PATCH 18/20] searchidx: support async git check Eric Wong 2020-07-24 5:56 ` [PATCH 19/20] searchidx: $batch_cb => v1_checkpoint Eric Wong 2020-07-24 5:56 ` [PATCH 20/20] v2writable: {unindexed} belongs in $sync state Eric Wong
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style List information: https://public-inbox.org/README * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20200724055606.27332-6-e@yhbt.net \ --to=e@yhbt.net \ --cc=meta@public-inbox.org \ --subject='Re: [PATCH 05/20] v2writable: move {autime} and {cotime} into $sync state' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
Code repositories for project(s) associated with this inbox: https://80x24.org/public-inbox.git This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).